diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index b9508889..145ea76d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java @@ -52,56 +52,63 @@ public class OrderService { @Transactional public int generateOrder(OrdersEntity ordersEntity, JSONArray listJson) throws Exception { AddOrSaveEntity addOrSaveEntity = new AddOrSaveEntity(); - if (ordersEntity.getCouponCode() != ""&& null != ordersEntity.getCouponCode()) { - CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity(); - couponCosumeEntity.setCouponCode(ordersEntity.getCouponCode()); - couponCosumeEntity.setOrderNo(ordersEntity.getOrderNo()); - couponCosumeEntity.setProductCode(ordersEntity.getProductCode()); - BigDecimal realCouponAmount =new BigDecimal(ordersEntity.getOrderAmount()); - couponCosumeEntity.setRealCouponAmount(realCouponAmount); - JSONObject jsonObject = JSONObject.parseObject(couponService.couponCosume(couponCosumeEntity)); - if(!jsonObject.getString("code").equals("0")) { + try { + if (ordersEntity.getCouponCode() != "" && null != ordersEntity.getCouponCode()) { + CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity(); + couponCosumeEntity.setCouponCode(ordersEntity.getCouponCode()); + couponCosumeEntity.setOrderNo(ordersEntity.getOrderNo()); + couponCosumeEntity.setProductCode(ordersEntity.getProductCode()); + BigDecimal realCouponAmount = new BigDecimal(ordersEntity.getOrderAmount()); + couponCosumeEntity.setRealCouponAmount(realCouponAmount); + JSONObject jsonObject = JSONObject.parseObject(couponService.couponCosume(couponCosumeEntity)); + if (!jsonObject.getString("code").equals("0")) { + return 0; + } + //coupon json化 + OrderCouponEntity orderCouponEntity = new OrderCouponEntity(); + orderCouponEntity.setCouponCode(ordersEntity.getCouponCode()); + orderCouponEntity.setCouponName(ordersEntity.getCouponName()); + orderCouponEntity.setCouponId(ordersEntity.getCouponId()); + Map orderCouponParamMap = MapRemoveNullUtil.setConditionMap(orderCouponEntity); + MapRemoveNullUtil.removeNullEntry(orderCouponParamMap); + net.sf.json.JSONObject orderCouponJson = net.sf.json.JSONObject.fromObject(orderCouponParamMap); + addOrSaveEntity.setOrderCoupon(orderCouponJson.toString()); + } + + Map paramMap = MapRemoveNullUtil.setConditionMap(ordersEntity); + paramMap.remove("orderAddress"); + paramMap.remove("couponTypeId"); + ObjectMapper objectMapper = new ObjectMapper(); + OrderEntity orderEntity = objectMapper.convertValue(paramMap, OrderEntity.class); + if (ordersDao.insert(orderEntity) == 1) { + ordersEntity.setOrderStatus("0"); + addOrSaveEntity.setPhoneNumber(ordersEntity.getPhoneNumber()); + addOrSaveEntity.setStatus("0"); + addOrSaveEntity.setOrderNumber(ordersEntity.getOrderNo()); + addOrSaveEntity.setSalesAmount(ordersEntity.getOrderAmount()); + addOrSaveEntity.setOrderDetailList(listJson.toString()); + OrderAddress orderAddress = ordersEntity.getOrderAddress(); + + addOrSaveEntity.setAddressCityName(orderAddress.getAddressCityName()); + addOrSaveEntity.setAddressCountyName(orderAddress.getAddressCountyName()); + addOrSaveEntity.setAddressDetailInfo(orderAddress.getAddressDetailInfo()); + addOrSaveEntity.setAddressPhoneNumber(orderAddress.getAddressPhoneNumber()); + addOrSaveEntity.setAddressProvinceName(orderAddress.getAddressProvinceName()); + addOrSaveEntity.setAddressUserName(orderAddress.getAddressUserName()); + JSONObject jsonObject = JSONObject.parseObject(addOrSave(addOrSaveEntity)); + + if (jsonObject.getString("code").equals("1")) + return 1; + else + return 0; + } else { return 0; } - //coupon json化 - OrderCouponEntity orderCouponEntity = new OrderCouponEntity(); - orderCouponEntity.setCouponCode(ordersEntity.getCouponCode()); - orderCouponEntity.setCouponName(ordersEntity.getCouponName()); - orderCouponEntity.setCouponId(ordersEntity.getCouponId()); - Map orderCouponParamMap = MapRemoveNullUtil.setConditionMap(orderCouponEntity); - MapRemoveNullUtil.removeNullEntry(orderCouponParamMap); - net.sf.json.JSONObject orderCouponJson = net.sf.json.JSONObject.fromObject(orderCouponParamMap); - addOrSaveEntity.setOrderCoupon(orderCouponJson.toString()); - } - - Map paramMap = MapRemoveNullUtil.setConditionMap(ordersEntity); - paramMap.remove("orderAddress"); - paramMap.remove("couponTypeId"); - ObjectMapper objectMapper = new ObjectMapper(); - OrderEntity orderEntity = objectMapper.convertValue(paramMap, OrderEntity.class); - if(ordersDao.insert(orderEntity) == 1) { - ordersEntity.setOrderStatus("0"); - addOrSaveEntity.setPhoneNumber(ordersEntity.getPhoneNumber()); - addOrSaveEntity.setStatus("0"); - addOrSaveEntity.setOrderNumber(ordersEntity.getOrderNo()); - addOrSaveEntity.setSalesAmount(ordersEntity.getOrderAmount()); - addOrSaveEntity.setOrderDetailList(listJson.toString()); - OrderAddress orderAddress = ordersEntity.getOrderAddress(); - - addOrSaveEntity.setAddressCityName(orderAddress.getAddressCityName()); - addOrSaveEntity.setAddressCountyName(orderAddress.getAddressCountyName()); - addOrSaveEntity.setAddressDetailInfo(orderAddress.getAddressDetailInfo()); - addOrSaveEntity.setAddressPhoneNumber(orderAddress.getAddressPhoneNumber()); - addOrSaveEntity.setAddressProvinceName(orderAddress.getAddressProvinceName()); - addOrSaveEntity.setAddressUserName(orderAddress.getAddressUserName()); - JSONObject jsonObject = JSONObject.parseObject(addOrSave(addOrSaveEntity)); - if(jsonObject.getString("code").equals("1")) - return 1; - else - return 0; - }else { - return 0; + }catch (Exception e){ + System.out.println(e.getMessage() + ); } + return 0; } public int checkNotify(String orderNumber){