mall-service/src/main/java/com/txz/mall/controller/OrderController.java

@@ -59,43 +59,43 @@ public class OrderController {
         return Result.success(record);
     }
 
-    @DeleteMapping("/delete")
-    @ApiOperation(value = "订单删除")
-    public Result delete(@RequestParam Long id) {
-        if (id == null) {
-            return Result.fail(ResultCode.ID_IS_NULL);
-        }
-        try {
-            StoreOrder storeOrder = new StoreOrder();
-            storeOrder.setId(id);
-            storeOrder.setIsDelete(1);
-            storeOrderService.update(storeOrder);
-        } catch (Exception e) {
-            log.error("删除对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success();
-    }
+//    @DeleteMapping("/delete")
+//    @ApiOperation(value = "订单删除")
+//    public Result delete(@RequestParam Long id) {
+//        if (id == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//        try {
+//            StoreOrder storeOrder = new StoreOrder();
+//            storeOrder.setId(id);
+//            storeOrder.setIsDelete(1);
+//            storeOrderService.update(storeOrder);
+//        } catch (Exception e) {
+//            log.error("删除对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success();
+//    }
 
-    @PutMapping("/update")
-    @ApiOperation(value = "订单更新")
-    public Result update(@RequestBody StoreOrder storeOrder) {
-        if (storeOrder == null) {
-            return Result.fail(ResultCode.OBJECT_IS_NULL);
-        }
-        if (storeOrder.getId() == null) {
-            return Result.fail(ResultCode.ID_IS_NULL);
-        }
-        try {
-            storeOrder.setUpdateTime(new Date());
-            //    		storeOrder.setUpdateUserId(userId);
-            storeOrderService.update(storeOrder);
-        } catch (Exception e) {
-            log.error("更新对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success();
-    }
+//    @PutMapping("/update")
+//    @ApiOperation(value = "订单更新")
+//    public Result update(@RequestBody StoreOrder storeOrder) {
+//        if (storeOrder == null) {
+//            return Result.fail(ResultCode.OBJECT_IS_NULL);
+//        }
+//        if (storeOrder.getId() == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//        try {
+//            storeOrder.setUpdateTime(new Date());
+//            //    		storeOrder.setUpdateUserId(userId);
+//            storeOrderService.update(storeOrder);
+//        } catch (Exception e) {
+//            log.error("更新对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success();
+//    }
 
     @GetMapping("/detail")
     @ApiOperation(value = "订单获取详情")
@@ -138,11 +138,11 @@ public class OrderController {
 //        return Result.success(pageInfo);
 //    }
 
-    @ApiOperation(value = "获取订单各状态数量")
-    @GetMapping(value = "/status/num")
-    public Result<StoreOrderCountItemVO> getOrderStatusNum() {
-        return Result.success(storeOrderService.getOrderStatusNum());
-    }
+//    @ApiOperation(value = "获取订单各状态数量")
+//    @GetMapping(value = "/status/num")
+//    public Result<StoreOrderCountItemVO> getOrderStatusNum() {
+//        return Result.success(storeOrderService.getOrderStatusNum());
+//    }
 
     @ApiOperation("导出订单")
     @PostMapping("/export")
@@ -160,14 +160,21 @@ public class OrderController {
 
     @ApiOperation("退款")
     @PostMapping("/refund")
-    public Result refund(@RequestParam("id") Long id) {
-        storeOrderService.refund(id);
+    public Result refund(@RequestParam("orderNo") String orderNo) {
+        if (ObjectUtils.isEmpty(orderNo) ) {
+            return Result.fail(ResultCode.CODE_IS_NULL);
+        }
+
+        storeOrderService.refund(orderNo);
         return Result.success();
     }
 
     @ApiOperation("关闭订单")
     @PostMapping("/close")
     public Result close(@RequestParam("orderNo") String orderNo) {
+        if (ObjectUtils.isEmpty(orderNo) ) {
+            return Result.fail(ResultCode.CODE_IS_NULL);
+        }
         storeOrderService.close(orderNo);
         return Result.success();
     }
@@ -186,6 +193,9 @@ public class OrderController {
     @ApiOperation("取消订单")
     @PostMapping("/cancel")
     public Result cancel(@RequestParam("orderNo") String orderNo) {
+        if (ObjectUtils.isEmpty(orderNo) ) {
+            return Result.fail(ResultCode.CODE_IS_NULL);
+        }
         storeOrderService.cancel(orderNo);
         return Result.success();
     }

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppOrderController.java

@@ -7,6 +7,7 @@ import com.txz.mall.business.OrderServiceBusiness;
 import com.txz.mall.core.AuthService;
 import com.txz.mall.core.Result;
 import com.txz.mall.core.ResultCode;
+import com.txz.mall.dao.StoreOrderMapper;
 import com.txz.mall.dubbo.client.CifUserDubboServiceClient;
 import com.txz.mall.model.StoreOrder;
 import com.txz.mall.service.StoreOrderService;
@@ -20,6 +21,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Condition;
 import vo.MyRecord;
 import vo.StoreOrderCountItemVO;
 import vo.StoreOrderVO;
@@ -64,45 +66,53 @@ public class AppOrderController {
         MyRecord record = storeOrderService.createOrder(orderRequest);
         return Result.success(record);
     }
-    
+
+    @Resource
+    private StoreOrderMapper storeOrderMapper;
     @DeleteMapping("/delete")
     @ApiOperation(value = "订单删除")
-    public Result delete(@RequestParam Long id) {
-        if (id == null) {
+    public Result delete(@RequestParam("orderNo") String orderNo) {
+        if (ObjectUtils.isEmpty(orderNo)) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
         try {
             StoreOrder storeOrder = new StoreOrder();
-            storeOrder.setId(id);
+           // storeOrder.setId(id);
             storeOrder.setIsDelete(1);
-            storeOrderService.update(storeOrder);
+
+            Condition condition = new Condition(StoreOrder.class);
+            condition.createCriteria().andEqualTo("orderId",orderNo);
+
+            storeOrderMapper.updateByConditionSelective(storeOrder,condition);
         } catch (Exception e) {
             log.error("删除对象操作异常e:{}", e);
             return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
         }
         return Result.success();
     }
-    
-    @PutMapping("/update")
-    @ApiOperation(value = "订单更新")
-    public Result update(@RequestBody StoreOrder storeOrder) {
-        if (storeOrder == null) {
-            return Result.fail(ResultCode.OBJECT_IS_NULL);
-        }
-        if (storeOrder.getId() == null) {
-            return Result.fail(ResultCode.ID_IS_NULL);
-        }
-        try {
-            storeOrder.setUpdateTime(new Date());
-            //    		storeOrder.setUpdateUserId(userId);
-            storeOrderService.update(storeOrder);
-        } catch (Exception e) {
-            log.error("更新对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success();
-    }
-    
+
+
+    //这个接口太危险了理论上不会有这种需求先注释掉再说
+//    @PutMapping("/update")
+//    @ApiOperation(value = "订单更新")
+//    public Result update(@RequestBody StoreOrder storeOrder) {
+//        if (storeOrder == null) {
+//            return Result.fail(ResultCode.OBJECT_IS_NULL);
+//        }
+//        if (storeOrder.getId() == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//        try {
+//            storeOrder.setUpdateTime(new Date());
+//            //    		storeOrder.setUpdateUserId(userId);
+//            storeOrderService.update(storeOrder);
+//        } catch (Exception e) {
+//            log.error("更新对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success();
+//    }
+//
     @PutMapping("/binding/address")
     @ApiOperation(value = "订单绑定地址")
     public Result update(@RequestBody StoreOrderUpdateParam storeOrderUpdateParam) {
@@ -197,6 +207,9 @@ public class AppOrderController {
     @ApiOperation("关闭订单")
     @PostMapping("/close")
     public Result close(@RequestParam("orderNo") String orderNo) {
+        if (ObjectUtils.isEmpty(orderNo)) {
+            return Result.fail(ResultCode.CODE_IS_NULL);
+        }
         storeOrderService.close(orderNo);
         return Result.success();
     }
@@ -204,6 +217,9 @@ public class AppOrderController {
     @ApiOperation("取消订单")
     @PostMapping("/cancel")
     public Result cancel(@RequestParam("orderNo") String orderNo) {
+        if (ObjectUtils.isEmpty(orderNo)) {
+            return Result.fail(ResultCode.CODE_IS_NULL);
+        }
         storeOrderService.cancel(orderNo);
         return Result.success();
     }
@@ -234,6 +250,9 @@ public class AppOrderController {
     @ApiOperation(value = "加载预下单")
     @PostMapping(value = "load/pre")
     public Result<PreOrderResponse> loadPreOrder(@RequestParam String preOrderNo) {
+        if (ObjectUtils.isEmpty(preOrderNo)) {
+            return Result.fail(ResultCode.CODE_IS_NULL);
+        }
         
         Long tokenUserId = AuthService.getTokenUserId(null);
         return Result.success(storeOrderService.loadPreOrder(preOrderNo));

mall-service/src/main/java/com/txz/mall/service/StoreOrderService.java

@@ -118,7 +118,7 @@ public interface StoreOrderService extends Service<StoreOrder> {
      *
      * @param id 订单编号
      */
-    void refund(Long id);
+    void refund(String orderNo);
 
     /**
      * 订单关闭

mall-service/src/main/java/com/txz/mall/service/impl/StoreOrderServiceImpl.java

@@ -1301,16 +1301,29 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         List<UserAddress> addressList = new ArrayList<>();
         Map<Long, StorePink> storePinkMap = new HashMap<>();
         if (CollectionUtils.isNotEmpty(list)) {
-            Condition infoCondition = new Condition(StoreOrderInfo.class);
-            Example.Criteria infoCriteria = infoCondition.createCriteria();
-            infoCriteria.andEqualTo("isDelete", 0);
-            infoCriteria.andIn("orderId", list.stream().map(StoreOrder::getId).collect(Collectors.toList()));
-            infoArrayList = storeOrderInfoService.findByCondition(infoCondition);
+            List<String> orderIdList = list.stream().map(StoreOrder::getOrderId).collect(Collectors.toList());
+            if(!org.springframework.util.CollectionUtils.isEmpty(orderIdList)) {
+                Condition infoCondition = new Condition(StoreOrderInfo.class);
+                Example.Criteria infoCriteria = infoCondition.createCriteria();
+                infoCriteria.andEqualTo("isDelete", 0);
+                infoCriteria.andIn("orderNo", orderIdList);
+                infoArrayList = storeOrderInfoService.findByCondition(infoCondition);
+
+                Condition statusCondition = new Condition(StoreOrderStatus.class);
+                Example.Criteria statusCriteria = statusCondition.createCriteria();
+                statusCriteria.andIn("orderId", orderIdList);
+                statusList = storeOrderStatusService.findByCondition(statusCondition);
+
+                Condition infoConditionStorePink = new Condition(StorePink.class);
+                Example.Criteria infoCriteriaStorePink = infoConditionStorePink.createCriteria();
+                infoCriteriaStorePink.andEqualTo("isDelete", 0);
+                infoCriteriaStorePink.andIn("orderId", orderIdList);
+                List<StorePink> byCondition = storePinkService.findByCondition(infoConditionStorePink);
+                if (!org.springframework.util.CollectionUtils.isEmpty(byCondition)) {
+                    storePinkMap = byCondition.stream().collect(Collectors.toMap(StorePink::getOrderIdKey, a -> a, (b, c) -> c));
+                }
 
-            Condition statusCondition = new Condition(StoreOrderStatus.class);
-            Example.Criteria statusCriteria = statusCondition.createCriteria();
-            statusCriteria.andIn("oid", list.stream().map(StoreOrder::getId).collect(Collectors.toList()));
-            statusList = storeOrderStatusService.findByCondition(statusCondition);
+            }
 
             Condition addressCondition = new Condition(UserAddress.class);
             Example.Criteria addressCriteria = addressCondition.createCriteria();
@@ -1318,20 +1331,9 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
             List<Long> collect = list.stream().map(StoreOrder::getAddressId).filter(Objects::nonNull).collect(Collectors.toList());
             if (!org.springframework.util.CollectionUtils.isEmpty(collect)) {
                 addressCriteria.andIn("id", collect);
-            }
-            addressList = userAddressService.findByCondition(addressCondition);
-
-
-            Condition infoConditionStorePink = new Condition(StorePink.class);
-            Example.Criteria infoCriteriaStorePink = infoConditionStorePink.createCriteria();
-            infoCriteriaStorePink.andEqualTo("isDelete", 0);
-            infoCriteriaStorePink.andIn("orderIdKey", list.stream().map(StoreOrder::getId).collect(Collectors.toList()));
-            List<StorePink> byCondition = storePinkService.findByCondition(infoConditionStorePink);
-            if (!org.springframework.util.CollectionUtils.isEmpty(byCondition)) {
-                storePinkMap = byCondition.stream().collect(Collectors.toMap(StorePink::getOrderIdKey, a -> a, (b, c) -> c));
+                addressList = userAddressService.findByCondition(addressCondition);
             }
 
-
         }
         List<StoreOrderInfo> finalInfoArrayList = infoArrayList;
         List<StoreOrderStatus> finalStatusList = statusList;
@@ -1889,8 +1891,10 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
 
     // 这是由pc端发起端针对个人的主动退款 不是定时任务扫描活动超时导致的退款，所以这个退款是不影响其他拼团成员的。拼团汇总表也不会上锁，拼团状态仍然是进行中
     @Override
-    public void refund(Long id) {
-        StoreOrder storeOrder = findById(id);
+    public void refund(String orderNo) {
+
+
+        StoreOrder storeOrder = findBy("orderId",orderNo);
         ////        if (storeOrder.getPaid().equals(Constants.ORDER_STATUS_H5_UNPAID)) {
         ////            throw new ServiceException("当前状态不支持退款");
         ////        }
@@ -1909,25 +1913,27 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         //
         //
         if (ObjectUtils.isEmpty(storeOrder)) {
-            throw new ServiceException(I18nUtil.get("order.does.not.exist.when.initiating.active.refund.id") + id);
+            throw new ServiceException(I18nUtil.get("order.does.not.exist.when.initiating.active.refund.id") + orderNo);
         }
 
         PinkOrderStatusEnum pinkOrderStatusEnum = OrderStateMachine.handleEvent(storeOrder, OrderEventsEnum.GROUP_PURCHASE_FAIL, null);
         if (ObjectUtils.isEmpty(pinkOrderStatusEnum)) {
-            throw new ServiceException(I18nUtil.get("current.status.does.not.support.refund.cancellation.id") + id);
+            throw new ServiceException(I18nUtil.get("current.status.does.not.support.refund.cancellation.id") + orderNo);
         }
 
-        StorePink storePink = storePinkService.findById(storeOrder.getPinkId());
+        StorePink storePink = storePinkService.findBy("orderId",orderNo);
         Integer status = 0;
+        // 批量退款接口调用 这块要前置，退款成功后再去改状态
+        if (ObjectUtils.isEmpty(storePink)) {
+            throw new ServiceException(I18nUtil.get("group.buying.information.does.not.exist.when.closing.due.to.group.buying.timeout.id") + orderNo);
+        }
+
         // 团长在未成团时不能退款
         if (storePink.getKId().equals(status) && storePink.getStatus().equals(StorePinkStatusEnum.NOT_DRAWN.getKey())) {
-            throw new ServiceException(I18nUtil.get("current.member.is.the.group.leader.and.the.group.has.not.drawn.a.prize.refund.is.temporarily.not.supported") + id);
+            throw new ServiceException(I18nUtil.get("current.member.is.the.group.leader.and.the.group.has.not.drawn.a.prize.refund.is.temporarily.not.supported") + orderNo);
         }
 
-        // 批量退款接口调用 这块要前置，退款成功后再去改状态
-        if (ObjectUtils.isEmpty(storePink)) {
-            throw new ServiceException(I18nUtil.get("group.buying.information.does.not.exist.when.closing.due.to.group.buying.timeout.id") + storeOrder.getPinkId());
-        }
+
 
         Date date = new Date();
         // 主动退款
@@ -1948,10 +1954,16 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         // 拼团状态回退
 
         StorePink storePinkForUpdate = new StorePink();
-        storePinkForUpdate.setId(storeOrder.getPinkId());
+       // storePinkForUpdate.setId(storeOrder.getPinkId());
         // storePinkForUpdate.setStatus(StorePinkStatusEnum.LOTTERY_FAILED.getKey());   //定时任务触发的拼团失败导致的订单退款需要设置这个状态为拼团失败状态
         storePinkForUpdate.setOrderStatus(pinkOrderStatusEnum.getKey());
-        storePinkService.update(storePinkForUpdate);
+        //**分库整改
+        Condition storePinkForUpdateCondition = new Condition(StorePink.class);
+        storePinkForUpdateCondition.createCriteria().andEqualTo("orderId",orderNo);
+        int i = storePinkMapper.updateByConditionSelective(storePinkForUpdate, storePinkForUpdateCondition);
+        //维护每日统计表数据
+        dailySalesSummaryOfProductsService.updateDailySalesSummaryOfProducts(orderNo,storePinkForUpdate);
+        // storePinkService.update(storePinkForUpdate);
         // 拼团汇总数量维护以及锁单标识维护
         Boolean b = storePinkSummaryService.maintainQuantityStatusOfTheStorePinkSummary(storePink.getSpsCode());
         // 拼团商品数量以及m_store_combination
@@ -2148,7 +2160,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
     public void cancel(String orderNo) {
         StoreOrder storeOrder = findBy("orderId",orderNo);
         if (ObjectUtils.isEmpty(storeOrder)) {
-            throw new ServiceException(I18nUtil.get("order.does.not.exist.when.canceling.the.order.id") + id);
+            throw new ServiceException(I18nUtil.get("order.does.not.exist.when.canceling.the.order.id") + orderNo);
         }
         PinkOrderStatusEnum pinkOrderStatusEnum = OrderStateMachine.handleEvent(storeOrder, OrderEventsEnum.GROUP_PURCHASE_CANCEL, null);
 
@@ -2257,7 +2269,21 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
 
             List<StoreOrderExportPO> errors = new ArrayList<>();
             for (StoreOrderExportPO po : list) {
-                StoreOrder storeOrder = this.findById(po.getId());
+
+                if(ObjectUtils.isEmpty(po.getOrderId())){
+                    po.setErrorMsg(I18nUtil.get("the.order.number.cannot.be.empty"));
+                    errors.add(po);
+                    continue;
+                }
+                //**分库分表整改
+                StoreOrder storeOrder = this.findBy("orderId",po.getOrderId());
+                if(ObjectUtils.isEmpty(storeOrder)){
+                    po.setErrorMsg(I18nUtil.get("order.does.not.exist"));
+                    errors.add(po);
+                    continue;
+                }
+
+               // StoreOrder storeOrder = this.findById(po.getId());
                 PinkOrderStatusEnum pinkOrderStatusEnum = OrderStateMachine.handleEvent(storeOrder, OrderEventsEnum.GROUP_PURCHASE_DELIVER, null);
                 if (ObjectUtil.isEmpty(pinkOrderStatusEnum)) {
                     po.setErrorMsg(I18nUtil.get("current.status.does.not.support.shipment"));
@@ -2277,17 +2303,29 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
                     continue;
                 }
 
-                storeOrder.setId(po.getId());
-                storeOrder.setDeliveryId(po.getDeliveryId());
-                storeOrder.setDeliveryName(po.getDeliveryName());
-                storeOrder.setStatus(pinkOrderStatusEnum.getKey());
-                storeOrder.setDeliveryTime(new Date());
+               // storeOrder.setId(po.getId());
+                StoreOrder storeOrderForUpdate = new StoreOrder();
+                storeOrderForUpdate.setDeliveryId(po.getDeliveryId());
+                storeOrderForUpdate.setDeliveryName(po.getDeliveryName());
+                storeOrderForUpdate.setStatus(pinkOrderStatusEnum.getKey());
+                storeOrderForUpdate.setDeliveryTime(new Date());
+                Condition condition = new Condition(StoreOrder.class);
+                condition.createCriteria().andEqualTo("orderId",po.getOrderId());
+                int i = storeOrderMapper.updateByConditionSelective(storeOrderForUpdate, condition);
+                //**分库整改
+               // update(storeOrder);
 
-                update(storeOrder);
+              //  StorePink pinkList = storePinkService.findBy("orderId", po.getOrderId());
 
-                StorePink pinkList = storePinkService.findBy("orderIdKey", po.getId());
-                pinkList.setOrderStatus(pinkOrderStatusEnum.getKey());
-                storePinkService.update(pinkList);
+                StorePink storePinkForUpdate = new StorePink();
+                storePinkForUpdate.setOrderStatus(pinkOrderStatusEnum.getKey());
+                Condition storePinkForUpdateCondition = new Condition(StorePink.class);
+                storePinkForUpdateCondition.createCriteria().andEqualTo("orderId",po.getOrderId());
+                storePinkMapper.updateByConditionSelective(storePinkForUpdate,storePinkForUpdateCondition);
+                //维护每日统计表
+                dailySalesSummaryOfProductsService.updateDailySalesSummaryOfProducts(po.getOrderId(),storePinkForUpdate);
+                //**分库整改
+               // storePinkService.update(pinkList);
 
                 noticeService.addOrderNotice(NoticeEnum.ORDER_SHIPPED_SUCCESS, storeOrder.getOrderId(), storeOrder.getUid());
             }

mall-service/src/main/resources/i18n/messages_en_US.properties

@@ -171,4 +171,5 @@ yixiashixinzengshuju
 the.group.buying.summary.data.does.not.exist=the group buying summary data does not exist
 store.pink.summary.order.no.set.not.exist=store pink summary order no set not exist
 order.code.is.empty=order code is empty
-cid.store.pink.summary.order.no.set.not.exist=cid store pink summary order no set not exist 
+cid.store.pink.summary.order.no.set.not.exist=cid store pink summary order no set not exist
+the.order.number.cannot.be.empty=the order number cannot be empty

mall-service/src/main/resources/i18n/messages_zh_CN.properties

@@ -169,3 +169,5 @@ store.pink.summary.order.no.set.not.exist=\u62FC\u56E2\u6C47\u603B\u8868\u65E0\u
 order.code.is.empty=\u8BA2\u5355\u7F16\u7801\u4E3A\u7A7A
 cid.store.pink.summary.order.no.set.not.exist=\u4F7F\u7528cid\u7684\u67E5\u8BE2pinksummary\u83B7\u53D6\u5230\u5230orderNoSet\u5168\u4E3A\u7A7A
 
+the.order.number.cannot.be.empty=\u8BA2\u5355\u53F7\u4E0D\u80FD\u4E3A\u7A7A
+