修改订单bugfix

src/main/java/com/caimei365/order/controller/OrderRefundApi.java

@@ -21,12 +21,6 @@ public class OrderRefundApi {
 
     private final OrderRefundService orderRefundService;
 
-//    @ApiOperation("一次性接口，数据初始化")
-//    @GetMapping("/init")
-//    public ResponseJson refundShopOrder(){
-//        return orderRefundService.initShopOrder();
-//    }
-
     @ApiOperation("子订单退款")
     @ApiImplicitParam(required = true, name = "shopOrderId", value = "子订单id")
     @GetMapping("/shopOrder")

src/main/java/com/caimei365/order/service/OrderRefundService.java

@@ -9,5 +9,4 @@ public interface OrderRefundService {
 
     ResponseJson refundShopOrder(Integer shopOrderId) throws Exception;
 
-    ResponseJson initShopOrder();
 }

src/main/java/com/caimei365/order/service/impl/OrderClubServiceImpl.java

@@ -675,24 +675,24 @@ public class OrderClubServiceImpl implements OrderClubService {
             int beans = userBeans + beansHistory.getNum();
             productService.updateUserBeans(beansHistory, beans, note);
         }
-        if (shopOrder.getTotalAmount() != null && shopOrder.getTotalAmount() < 1000) {
-            //查本单是否扣豆子，有就返回
-            UserBeansHistoryPo bean = baseMapper.findLowOrder(shopOrder.getShopOrderId());
-            if (bean != null) {
-                //有扣豆子记录
-                UserBeansHistoryPo beansHistory = new UserBeansHistoryPo();
-                beansHistory.setUserId(shopOrder.getUserId());
-                beansHistory.setOrderId(shopOrder.getShopOrderId());
-                beansHistory.setBeansType(16);
-                beansHistory.setType(1);
-                beansHistory.setNum(500);
-                beansHistory.setPushStatus(0);
-                beansHistory.setAddTime(date);
-                beansHistory.setDelFlag(0);
-                int beans = baseMapper.getUserBeans(shopOrder.getUserId()) + 500;
-                productService.updateUserBeans(beansHistory, beans, note);
-            }
-        }
+//        if (shopOrder.getTotalAmount() != null && shopOrder.getTotalAmount() < 1000) {
+//            //查本单是否扣豆子，有就返回
+//            UserBeansHistoryPo bean = baseMapper.findLowOrder(shopOrder.getShopOrderId());
+//            if (bean != null) {
+//                //有扣豆子记录
+//                UserBeansHistoryPo beansHistory = new UserBeansHistoryPo();
+//                beansHistory.setUserId(shopOrder.getUserId());
+//                beansHistory.setOrderId(shopOrder.getShopOrderId());
+//                beansHistory.setBeansType(16);
+//                beansHistory.setType(1);
+//                beansHistory.setNum(500);
+//                beansHistory.setPushStatus(0);
+//                beansHistory.setAddTime(date);
+//                beansHistory.setDelFlag(0);
+//                int beans = baseMapper.getUserBeans(shopOrder.getUserId()) + 500;
+//                productService.updateUserBeans(beansHistory, beans, note);
+//            }
+//        }
         //取消订单短信推送（取消推送）
         /*if (orderClubMapper.getProductOrder(orderId).contains(6060)) {
             String bindMobile = baseMapper.getBindMobileByUserId(order.getUserId());

src/main/java/com/caimei365/order/service/impl/OrderRefundServiceImpl.java

@@ -147,59 +147,30 @@ public class OrderRefundServiceImpl implements OrderRefundService {
                 userBeans = userBeans - num;
                 user.setUserBeans(userBeans);
             }
-            //订单低于1000扣500豆子退回
-            if (order.getPayTotalFee() != null && order.getPayTotalFee() < 1000) {
-                // 查本单是否扣豆子，有且订单交易全退就返回
-                UserBeansHistoryPo bean = refundMapper.findLowOrder(order.getOrderId());
-                if (bean != null && 0 == count) {
-                    //有扣豆子记录
-                    UserBeansHistoryPo beanHistory = new UserBeansHistoryPo();
-                    beanHistory.setUserId(order.getUserId());
-                    beanHistory.setOrderId(order.getOrderId());
-                    beanHistory.setBeansType(16);
-                    beanHistory.setType(1);
-                    beanHistory.setNum(500);
-                    beanHistory.setPushStatus(0);
-                    beanHistory.setAddTime(new Date());
-                    baseMapper.insertBeansHistory(beanHistory);
-                    user.setUserBeans(user.getUserBeans() + 500);
-                }
-            }
+//            //订单低于1000扣500豆子退回
+//            if (order.getPayTotalFee() != null && order.getPayTotalFee() < 1000) {
+//                // 查本单是否扣豆子，有且订单交易全退就返回
+//                UserBeansHistoryPo bean = refundMapper.findLowOrder(order.getOrderId());
+//                if (bean != null && 0 == count) {
+//                    //有扣豆子记录
+//                    UserBeansHistoryPo beanHistory = new UserBeansHistoryPo();
+//                    beanHistory.setUserId(order.getUserId());
+//                    beanHistory.setOrderId(order.getOrderId());
+//                    beanHistory.setBeansType(16);
+//                    beanHistory.setType(1);
+//                    beanHistory.setNum(500);
+//                    beanHistory.setPushStatus(0);
+//                    beanHistory.setAddTime(new Date());
+//                    baseMapper.insertBeansHistory(beanHistory);
+//                    user.setUserBeans(user.getUserBeans() + 500);
+//                }
+//            }
         }
         // 修改user信息
         refundMapper.updateUser(user);
         return ResponseJson.success();
     }
 
-    @Override
-    public ResponseJson initShopOrder() {
-        /**
-         * 退款单数据拆分
-         * 查询有多个子订单退款的主订单，把有多个子订单的退款单拆分成以子订单为退款单
-         */
-        List<CmReturnedPurchase> shopOrders = refundMapper.findRefundShopOrder();
-        shopOrders.forEach(s -> {
-            // 有几个子订单，复制count-1数量的退款单
-            CmReturnedPurchase returns = refundMapper.findReturnd(s.getId());
-            // 拿到当前退款单的绑定子订单,循环次数=子订单数量-1,最后一个子订单不动,前置子订单退款单id变更为复制品
-            List<Integer> shopOrderIds = refundMapper.findReturnShops(returns.getId());
-            int count = shopOrderIds.size() - 1;
-            log.info("-------原退款单id--------" + returns.getId() + "------去重的子订单--------------" + shopOrderIds);
-            if (null != shopOrderIds && shopOrderIds.size() > 1) {
-                for (int i = 0; i < count; i++) {
-                    log.info("-------退款单" + returns.getId() + "第" + (i + 1) + "次复制------");
-                    // 拿到复制退款单，把cm_returned_purchase_product表中子订单换绑returnedID到新单
-                    returns.setId(null);
-                    refundMapper.insertReturns(returns);
-                    log.info("--------复制品Id--------- " + returns.getId() + "修改子订单Id-------------------- " + shopOrderIds.get(i));
-                    refundMapper.updateReturn(shopOrderIds.get(i), returns.getId());
-                }
-            }
-            log.info("====================退款单复制结束===========================");
-        });
-        return ResponseJson.success();
-    }
-
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public void returnOnline(OrderReceiptRelationPo relationPo) throws Exception {

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -1835,43 +1835,43 @@ public class SubmitServiceImpl implements SubmitService {
          * 自主下单价格低于1000，倒扣500采美豆
          */
         if (0 == organizeId) {
-            try {
-                if (orderParamBo.getCartType() != 3 && payTotalFee.get() < 1000) {
-                    if (orderParamBo.getUserBeans() < 0) {
-                        //设置手动回滚事务
-                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                        return ResponseJson.error(-4, "采美豆不足，不能提交订单。建议您前往采美旗下“呵呵商城”小程序购买小额商品。");
-                    } else {
-                        //查历史2021.10.27后是否有两个1000以下订单，有return不让下单，没有扣豆子
-                        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                        Date orderTime = format.parse("2021-10-28 10:40:01");
-                        List<Integer> mainOrderIds = submitMapper.findLowOrder(mainOrder.getUserId(), orderTime);
-                        if (mainOrderIds != null && mainOrderIds.size() > 2) {
-                            //设置手动回滚事务
-                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                            return ResponseJson.error(-3, "您已有2个采购金额过小的订单，本次不能再进行采购。您可使用微信扫描以下二维码，进入采美旗下“呵呵商城”小程序购买小额商品");
-                        }
-                        if (orderParamBo.getOrderMiniType() == 0) {
-                            if (mainOrderIds != null && mainOrderIds.size() <= 1) {
-                                // 设置手动回滚事务
-                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                                return ResponseJson.error(-5, "采购金额过小，将扣除500采美豆，建议您使用微信扫描以下二维码，进入采美旗下“呵呵商城”小程序购买小额商品。");
-                            }
-                        }
-                        log.info("订单提交状态:" + orderParamBo.getOrderMiniType());
-                        UserBeansHistoryPo beansHistory = new UserBeansHistoryPo();
-                        beansHistory.setUserId(mainOrder.getUserId());
-                        beansHistory.setOrderId(mainOrder.getOrderId());
-                        beansHistory.setBeansType(15);
-                        beansHistory.setType(2);
-                        beansHistory.setNum(500);
-                        beansHistory.setPushStatus(0);
-                        beansHistory.setAddTime(date);
-                        beansHistory.setDelFlag(0);
-                        int beans = baseMapper.findBeans(orderParamBo.getUserId()) - 500;
-                        productService.updateUserBeans(beansHistory, beans, "【价格低于1000，倒扣500采美豆】");
-                    }
-                }
+//            try {
+//                if (orderParamBo.getCartType() != 3 && payTotalFee.get() < 1000) {
+//                    if (orderParamBo.getUserBeans() < 0) {
+//                        //设置手动回滚事务
+//                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//                        return ResponseJson.error(-4, "采美豆不足，不能提交订单。建议您前往采美旗下“呵呵商城”小程序购买小额商品。");
+//                    } else {
+//                        //查历史2021.10.27后是否有两个1000以下订单，有return不让下单，没有扣豆子
+//                        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                        Date orderTime = format.parse("2021-10-28 10:40:01");
+//                        List<Integer> mainOrderIds = submitMapper.findLowOrder(mainOrder.getUserId(), orderTime);
+//                        if (mainOrderIds != null && mainOrderIds.size() > 2) {
+//                            //设置手动回滚事务
+//                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//                            return ResponseJson.error(-3, "您已有2个采购金额过小的订单，本次不能再进行采购。您可使用微信扫描以下二维码，进入采美旗下“呵呵商城”小程序购买小额商品");
+//                        }
+//                        if (orderParamBo.getOrderMiniType() == 0) {
+//                            if (mainOrderIds != null && mainOrderIds.size() <= 1) {
+//                                // 设置手动回滚事务
+//                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//                                return ResponseJson.error(-5, "采购金额过小，将扣除500采美豆，建议您使用微信扫描以下二维码，进入采美旗下“呵呵商城”小程序购买小额商品。");
+//                            }
+//                        }
+//                        log.info("订单提交状态:" + orderParamBo.getOrderMiniType());
+//                        UserBeansHistoryPo beansHistory = new UserBeansHistoryPo();
+//                        beansHistory.setUserId(mainOrder.getUserId());
+//                        beansHistory.setOrderId(mainOrder.getOrderId());
+//                        beansHistory.setBeansType(15);
+//                        beansHistory.setType(2);
+//                        beansHistory.setNum(500);
+//                        beansHistory.setPushStatus(0);
+//                        beansHistory.setAddTime(date);
+//                        beansHistory.setDelFlag(0);
+//                        int beans = baseMapper.findBeans(orderParamBo.getUserId()) - 500;
+//                        productService.updateUserBeans(beansHistory, beans, "【价格低于1000，倒扣500采美豆】");
+//                    }
+//                }
                 if (orderParamBo.getOrderMiniType() != 2) {
                     boolean bol = false;
                     // 机构一级分类
@@ -1892,9 +1892,9 @@ public class SubmitServiceImpl implements SubmitService {
                         return ResponseJson.error(-6, "订单内存在械字号三类商品，需要拥有医疗执业许可证的医美机构才能购买。建议升级医美机构后再下单，否则会导致订单退款或影响发货。");
                     }
                 }
-            } catch (ParseException e) {
-                log.info("自主下单价格低于1000，倒扣500采美豆", e);
-            }
+//            } catch (ParseException e) {
+//                log.info("自主下单价格低于1000，倒扣500采美豆", e);
+//            }
 
             /*
              * 保存优惠券使用情况

src/main/resources/mapper/SubmitMapper.xml

@@ -436,6 +436,7 @@
     <update id="updateOrderProduct">
         update cm_order_product
         set price                   = #{price},
+            discountPrice           = #{price},
             costPrice               = #{costPrice},
             totalAmount             = #{totalAmount},
             totalFee                = #{totalFee},