diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java index 22005238..ac5340c4 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java @@ -77,65 +77,69 @@ public class OrderController { JSONArray orderDatilListJson = new JSONArray(); OrdersEntity ordersEntity = new OrdersEntity(); OrderAddress orderAddress = new OrderAddress(); - for (OrdersEntity ordersEntitys:ordersEntityList) { - cartService.cancelProduct(ordersEntitys.getMemberId(),ordersEntity.getProductCode()); - //存储orderDetailList - OrderDatilListEntity orderDatilListEntity= new OrderDatilListEntity(); - orderDatilListEntity.setProductName(ordersEntitys.getProductName()); - orderDatilListEntity.setPcs(ordersEntitys.getBuyCount()); - orderDatilListEntity.setProductCode(ordersEntitys.getProductCode()); - orderDatilListEntity.setEcPrice(ordersEntitys.getPayAmount()); - orderDatilListJson.add(orderDatilListEntity); - if(ordersEntitys.getCouponCode() != "" && ordersEntitys.getCouponCode() != null) { - CouponGetAllEntity couponGetAllEntity = new CouponGetAllEntity (); - couponGetAllEntity.setMemberId(ordersEntitys.getMemberId()); - couponGetAllEntity.setCouponCode(ordersEntitys.getCouponCode()); - String couponInfo = couponService.couponGetAll(couponGetAllEntity); - JSONObject jsonObject = JSONObject.parseObject(couponInfo); - com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(jsonObject.getString("data")); - JSONObject jsonObjectData = (JSONObject)jsonArray.get(0); + try { + for (OrdersEntity ordersEntitys : ordersEntityList) { + cartService.cancelProduct(ordersEntitys.getMemberId(), ordersEntity.getProductCode()); + //存储orderDetailList + OrderDatilListEntity orderDatilListEntity = new OrderDatilListEntity(); + orderDatilListEntity.setProductName(ordersEntitys.getProductName()); + orderDatilListEntity.setPcs(ordersEntitys.getBuyCount()); + orderDatilListEntity.setProductCode(ordersEntitys.getProductCode()); + orderDatilListEntity.setEcPrice(ordersEntitys.getPayAmount()); + orderDatilListJson.add(orderDatilListEntity); + if (ordersEntitys.getCouponCode() != "" && ordersEntitys.getCouponCode() != null) { + CouponGetAllEntity couponGetAllEntity = new CouponGetAllEntity(); + couponGetAllEntity.setMemberId(ordersEntitys.getMemberId()); + couponGetAllEntity.setCouponCode(ordersEntitys.getCouponCode()); + String couponInfo = couponService.couponGetAll(couponGetAllEntity); + JSONObject jsonObject = JSONObject.parseObject(couponInfo); + com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(jsonObject.getString("data")); + JSONObject jsonObjectData = (JSONObject) jsonArray.get(0); - ordersEntity.setCouponAmount(jsonObjectData.getString("couponAmount") == null ?jsonObjectData.getString("discount"):jsonObjectData.getString("couponAmount")); - ordersEntity.setCouponCode(jsonObjectData.getString("couponCode")); - ordersEntity.setCouponName(jsonObjectData.getString("couponName")); - ordersEntity.setCouponId(jsonObjectData.getString("couponId")); - total_fee = total_fee + orderService.couponTotal(ordersEntitys.getCouponTypeId(),Double.parseDouble(ordersEntitys.getCouponAmount()),Double.parseDouble(ordersEntitys.getPayAmount()),ordersEntitys.getBuyCount()); - }else{ - total_fee = total_fee + Double.parseDouble(ordersEntitys.getPayAmount()) * ordersEntitys.getBuyCount() ; + ordersEntity.setCouponAmount(jsonObjectData.getString("couponAmount") == null ? jsonObjectData.getString("discount") : jsonObjectData.getString("couponAmount")); + ordersEntity.setCouponCode(jsonObjectData.getString("couponCode")); + ordersEntity.setCouponName(jsonObjectData.getString("couponName")); + ordersEntity.setCouponId(jsonObjectData.getString("couponId")); + total_fee = total_fee + orderService.couponTotal(ordersEntitys.getCouponTypeId(), Double.parseDouble(ordersEntitys.getCouponAmount()), Double.parseDouble(ordersEntitys.getPayAmount()), ordersEntitys.getBuyCount()); + } else { + total_fee = total_fee + Double.parseDouble(ordersEntitys.getPayAmount()) * ordersEntitys.getBuyCount(); + } + basePoint = basePoint + ordersEntitys.getBasePoint(); + orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName()); + orderAddress.setAddressCountyName(ordersEntitys.getOrderAddress().getAddressCountyName()); + orderAddress.setAddressDetailInfo(ordersEntitys.getOrderAddress().getAddressDetailInfo()); + orderAddress.setAddressPhoneNumber(ordersEntitys.getOrderAddress().getAddressPhoneNumber()); + orderAddress.setAddressUserName(ordersEntitys.getOrderAddress().getAddressUserName()); + orderAddress.setAddressProvinceName(ordersEntitys.getOrderAddress().getAddressProvinceName()); + productId.append(ordersEntitys.getProductCode() + ","); + productName.append(ordersEntitys.getProductName() + ","); + memberId = ordersEntitys.getMemberId(); + mobile = ordersEntitys.getPhoneNumber(); + buyCount = buyCount + ordersEntitys.getBuyCount(); } - basePoint = basePoint + ordersEntitys.getBasePoint(); - orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName()); - orderAddress.setAddressCountyName(ordersEntitys.getOrderAddress().getAddressCountyName()); - orderAddress.setAddressDetailInfo(ordersEntitys.getOrderAddress().getAddressDetailInfo()); - orderAddress.setAddressPhoneNumber(ordersEntitys.getOrderAddress().getAddressPhoneNumber()); - orderAddress.setAddressUserName(ordersEntitys.getOrderAddress().getAddressUserName()); - orderAddress.setAddressProvinceName(ordersEntitys.getOrderAddress().getAddressProvinceName()); - productId.append(ordersEntitys.getProductCode()+","); - productName.append(ordersEntitys.getProductName()+","); - memberId = ordersEntitys.getMemberId(); - mobile = ordersEntitys.getPhoneNumber(); - buyCount = buyCount + ordersEntitys.getBuyCount(); - } - ordersEntity.setOrderAddress(orderAddress); - ordersEntity.setProductCode(productId.substring(0,productId.length()-1)); - ordersEntity.setProductName(productName.substring(0,productName.length()-1)); - ordersEntity.setOrderAmount(StringUtil.toString(total_fee)); - ordersEntity.setMemberId(memberId); - ordersEntity.setPhoneNumber(mobile); - ordersEntity.setBuyCount(buyCount); - ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo()); - ordersEntity.setOrderStatus("0"); - ordersEntity.setBasePoint(basePoint); + ordersEntity.setOrderAddress(orderAddress); + ordersEntity.setProductCode(productId.substring(0, productId.length() - 1)); + ordersEntity.setProductName(productName.substring(0, productName.length() - 1)); + ordersEntity.setOrderAmount(StringUtil.toString(total_fee)); + ordersEntity.setMemberId(memberId); + ordersEntity.setPhoneNumber(mobile); + ordersEntity.setBuyCount(buyCount); + ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo()); + ordersEntity.setOrderStatus("0"); + ordersEntity.setBasePoint(basePoint); - if(orderService.generateOrder(ordersEntity,orderDatilListJson) == 1){ - wxPayEntity.setProduct_id(ordersEntity.getProductCode()); - wxPayEntity.setTotal_fee(StringUtil.toString(total_fee)); - wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo()); - Map returnMap = new HashMap<>(); - returnMap.put("orderNumber",ordersEntity.getOrderNo()); - returnMap.put("orderAmount",ordersEntity.getOrderAmount()); + if (orderService.generateOrder(ordersEntity, orderDatilListJson) == 1) { + wxPayEntity.setProduct_id(ordersEntity.getProductCode()); + wxPayEntity.setTotal_fee(StringUtil.toString(total_fee)); + wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo()); + Map returnMap = new HashMap<>(); + returnMap.put("orderNumber", ordersEntity.getOrderNo()); + returnMap.put("orderAmount", ordersEntity.getOrderAmount()); // return ResponseDTO.succData(returnMap,wxpayService.generateQRCode(wxPayEntity)); - return ResponseDTO.succData(returnMap,wxpayService.testGenerateQRCode(wxPayEntity)); + return ResponseDTO.succData(returnMap, wxpayService.testGenerateQRCode(wxPayEntity)); + } + }catch (Exception e){ + System.out.println(e.getMessage()); } return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_FAIL); }