From 4fd867946f35aa7a7a9d41a64bbab33a9b3ab282 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Tue, 28 Dec 2021 18:36:40 +0800 Subject: [PATCH] fix bugger --- .../system/royalcanin/good/OrderController.java | 17 +++++++++++++---- .../royalcanin/good/service/OrderService.java | 12 ++++++++++-- .../royalcanin/orderMaster/AddOrSaveEntity.java | 2 -- .../system/royalcanin/Order/OrderMapper.xml | 5 +++-- 4 files changed, 26 insertions(+), 10 deletions(-) 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 a382fb2e..2e53e1f3 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 @@ -15,7 +15,9 @@ import net.lab1024.smartadmin.module.system.qrcode.QRCodeUtil; import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderResponseCodeConst; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrdersEntity; import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService; +import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.AddOrSaveEntity; import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.OrderDatilListEntity; +import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.QueryEntity; import net.lab1024.smartadmin.module.system.wxpay.WxpayService; import net.lab1024.smartadmin.module.system.wxpay.wxPayModel.WxPayEntity; import net.lab1024.smartadmin.util.GenerateSequenceUtil; @@ -43,7 +45,7 @@ public class OrderController { @ApiOperation(value = "微信支付订单", notes = "生成订单") @PostMapping("royalcanin/generateOrderWX") - public void generateOrderWX(@RequestBody List ordersEntityList, HttpServletResponse response) throws Exception { + public ResponseDTO generateOrderWX(@RequestBody List ordersEntityList) throws Exception { StringBuffer productId = new StringBuffer(); StringBuffer productName = new StringBuffer(); String memberId = ""; @@ -76,12 +78,15 @@ public class OrderController { ordersEntity.setPhoneNumber(mobile); ordersEntity.setBuyCount(buyCount); ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo()); + ordersEntity.setOrderStatus("0"); if(orderService.generateOrder(ordersEntity,orderDatilListJson) == 1){ wxPayEntity.setProduct_id(ordersEntity.getProductId()); wxPayEntity.setTotal_fee(StringUtil.toString(total_fee)); wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo()); - QRCodeUtil.createCodeToOutputStream(wxpayService.generateQRCode(wxPayEntity), response.getOutputStream()); +// QRCodeUtil.createCodeToOutputStream(, response.getOutputStream()); + return ResponseDTO.succData(wxpayService.generateQRCode(wxPayEntity)); } + return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_FAIL); } @@ -94,8 +99,11 @@ public class OrderController { @ApiOperation(value = "取消订单", notes = "取消订单") @RequestMapping(value = "royalcanin/cancelOrder",method = RequestMethod.POST) - public ResponseDTO cancelOrder(String orderNo) throws Exception { - return orderService.cancelOrder(orderNo); + public ResponseDTO cancelOrder(@RequestBody QueryEntity queryEntity) throws Exception { + queryEntity.setChannelId("15"); + queryEntity.setSecret("H5@2021"); + String orderEntityJson = orderService.query(queryEntity); + return orderService.cancelOrder(orderEntityJson); } @@ -135,6 +143,7 @@ public class OrderController { ordersEntity.setPhoneNumber(mobile); ordersEntity.setBuyCount(buyCount); ordersEntity.setPayType("2"); + ordersEntity.setOrderStatus("0"); if(orderService.generateOrder(ordersEntity,orderDatilListJson) == 1){ aliPayEntity.setProduct_code(ordersEntity.getProductId()); aliPayEntity.setTotal_amount(StringUtil.toString(total_fee)); 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 7defa370..6ee03adc 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 @@ -86,9 +86,13 @@ public class OrderService { } @Transactional - public ResponseDTO cancelOrder(String orderNo) throws Exception { + public ResponseDTO cancelOrder(String addOrSaveJson) throws Exception { + com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(addOrSaveJson); + JSONObject jsonObject = (JSONObject)jsonArray.get(0); + String orderNo = jsonObject.getString("orderNumber"); OrdersEntity ordersEntity = ordersDao.findByOrderId(orderNo); - if(ordersEntity.getCouponCode() != ""&& null!= ordersEntity.getCouponCode()){ + + if(!ordersEntity.getCouponCode().equals("")&& null!= ordersEntity.getCouponCode()){ CouponFetchEntity couponFetchEntity = new CouponFetchEntity(); couponFetchEntity.setChannelId(15); couponFetchEntity.setChannelSecurity("H5@2021"); @@ -101,6 +105,10 @@ public class OrderService { addOrSaveEntity.setOrderNumber(orderNo); addOrSaveEntity.setPhoneNumber(ordersEntity.getPhoneNumber()); addOrSaveEntity.setStatus("3"); + addOrSaveEntity.setOrderDetailList(jsonObject.getString("orderDetailList")); + addOrSaveEntity.setDeliveryType(jsonObject.getString("deliveryType")); + addOrSaveEntity.setSalesAmount(jsonObject.getString("salesAmount")); + addOrSaveEntity.setOrderDate(jsonObject.getString("orderDate")); addOrSave(addOrSaveEntity); } return ResponseDTO.succ(); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/AddOrSaveEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/AddOrSaveEntity.java index e2343b02..490c9487 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/AddOrSaveEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/AddOrSaveEntity.java @@ -2,10 +2,8 @@ package net.lab1024.smartadmin.module.system.royalcanin.orderMaster; import lombok.Data; import net.lab1024.smartadmin.util.SmartDateUtil; -import net.sf.json.JSONArray; import java.util.Date; -import java.util.List; @Data public class AddOrSaveEntity { diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/Order/OrderMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/Order/OrderMapper.xml index 9ffbd11d..b8fe00de 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/Order/OrderMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/Order/OrderMapper.xml @@ -5,7 +5,7 @@ type="net.lab1024.smartadmin.module.system.royalcanin.good.model.OrdersEntity"> @@ -16,8 +16,9 @@ - update t_good_orders where order_no = #{out_trade_no} + update t_good_orders set order_status ='3' + where order_no = #{out_trade_no} \ No newline at end of file