This commit is contained in:
Carl 2022-01-29 19:40:10 +08:00
parent 990743412a
commit 801ac2979c

View File

@ -52,15 +52,16 @@ public class OrderService {
@Transactional @Transactional
public int generateOrder(OrdersEntity ordersEntity, JSONArray listJson) throws Exception { public int generateOrder(OrdersEntity ordersEntity, JSONArray listJson) throws Exception {
AddOrSaveEntity addOrSaveEntity = new AddOrSaveEntity(); AddOrSaveEntity addOrSaveEntity = new AddOrSaveEntity();
if (ordersEntity.getCouponCode() != ""&& null != ordersEntity.getCouponCode()) { try {
if (ordersEntity.getCouponCode() != "" && null != ordersEntity.getCouponCode()) {
CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity(); CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity();
couponCosumeEntity.setCouponCode(ordersEntity.getCouponCode()); couponCosumeEntity.setCouponCode(ordersEntity.getCouponCode());
couponCosumeEntity.setOrderNo(ordersEntity.getOrderNo()); couponCosumeEntity.setOrderNo(ordersEntity.getOrderNo());
couponCosumeEntity.setProductCode(ordersEntity.getProductCode()); couponCosumeEntity.setProductCode(ordersEntity.getProductCode());
BigDecimal realCouponAmount =new BigDecimal(ordersEntity.getOrderAmount()); BigDecimal realCouponAmount = new BigDecimal(ordersEntity.getOrderAmount());
couponCosumeEntity.setRealCouponAmount(realCouponAmount); couponCosumeEntity.setRealCouponAmount(realCouponAmount);
JSONObject jsonObject = JSONObject.parseObject(couponService.couponCosume(couponCosumeEntity)); JSONObject jsonObject = JSONObject.parseObject(couponService.couponCosume(couponCosumeEntity));
if(!jsonObject.getString("code").equals("0")) { if (!jsonObject.getString("code").equals("0")) {
return 0; return 0;
} }
//coupon json化 //coupon json化
@ -79,7 +80,7 @@ public class OrderService {
paramMap.remove("couponTypeId"); paramMap.remove("couponTypeId");
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
OrderEntity orderEntity = objectMapper.convertValue(paramMap, OrderEntity.class); OrderEntity orderEntity = objectMapper.convertValue(paramMap, OrderEntity.class);
if(ordersDao.insert(orderEntity) == 1) { if (ordersDao.insert(orderEntity) == 1) {
ordersEntity.setOrderStatus("0"); ordersEntity.setOrderStatus("0");
addOrSaveEntity.setPhoneNumber(ordersEntity.getPhoneNumber()); addOrSaveEntity.setPhoneNumber(ordersEntity.getPhoneNumber());
addOrSaveEntity.setStatus("0"); addOrSaveEntity.setStatus("0");
@ -95,13 +96,19 @@ public class OrderService {
addOrSaveEntity.setAddressProvinceName(orderAddress.getAddressProvinceName()); addOrSaveEntity.setAddressProvinceName(orderAddress.getAddressProvinceName());
addOrSaveEntity.setAddressUserName(orderAddress.getAddressUserName()); addOrSaveEntity.setAddressUserName(orderAddress.getAddressUserName());
JSONObject jsonObject = JSONObject.parseObject(addOrSave(addOrSaveEntity)); JSONObject jsonObject = JSONObject.parseObject(addOrSave(addOrSaveEntity));
if(jsonObject.getString("code").equals("1"))
if (jsonObject.getString("code").equals("1"))
return 1; return 1;
else else
return 0; return 0;
}else { } else {
return 0; return 0;
} }
}catch (Exception e){
System.out.println(e.getMessage()
);
}
return 0;
} }
public int checkNotify(String orderNumber){ public int checkNotify(String orderNumber){