优惠券改造

yiqi-admin/src/main/java/com/yiqi/admin/controller/order/OrderClothController.java

@@ -102,7 +102,7 @@ public class OrderClothController extends BaseController {
     @PreAuthorize("@ss.hasPermi('order:cloth:selectOrg')")
     @Transactional(rollbackFor = Exception.class)
     @ApiOperation("云洗订单分配工厂")
-    @PostMapping(value = "selectOrg")
+    @PostMapping(value = "/selectOrg")
     @Log(title = "云洗分配工厂", businessType = BusinessType.UPDATE)
     public R<OrderCloth> selectOrg(@RequestBody @Valid OrderClothSelectOrgDTO orderClothSelectOrgDTO) throws Exception {
         OrderCloth orderCloth = orderClothService.getOne(new QueryWrapper<OrderCloth>().lambda()
@@ -120,7 +120,7 @@ public class OrderClothController extends BaseController {
     }
 
     @ApiOperation("根据订单编号获取订单状态")
-    @GetMapping(value = "getOrderStatusByOrderNo")
+    @GetMapping(value = "/getOrderStatusByOrderNo")
     public R<String> getOrderStatusByOrderNo(@RequestParam @ApiParam("订单编号") String orderNo) throws Exception {
         LambdaQueryWrapper<OrderCloth> queryWrapper = new QueryWrapper<OrderCloth>().lambda().eq(OrderCloth::getOrderNo, orderNo);
         if (SourceType.FACTORY.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
@@ -139,7 +139,7 @@ public class OrderClothController extends BaseController {
 
     @Transactional(rollbackFor = Exception.class)
     @ApiOperation("衣服确认送达")
-    @GetMapping(value = "confirmSend")
+    @GetMapping(value = "/confirmSend")
     public R confirmSend(@RequestParam Long orderId) throws Exception {
         OrderCloth orderCloth = orderClothService.getOne(new QueryWrapper<OrderCloth>().lambda()
                 .eq(OrderCloth::getId, orderId)
@@ -167,7 +167,7 @@ public class OrderClothController extends BaseController {
 
     @Transactional(rollbackFor = Exception.class)
     @ApiOperation("第三方快递配送")
-    @PostMapping(value = "setThirdDelivery")
+    @PostMapping(value = "/setThirdDelivery")
     public R setThirdDelivery(@RequestBody @Valid OrderClothThirdDeliverySendDTO orderClothThirdDeliverySendDTO) throws Exception {
 //        OrderCloth orderCloth = orderClothService.getOne(new QueryWrapper<OrderCloth>().lambda()
 //                .eq(OrderCloth::getOrderNo, orderClothThirdDeliverySendDTO.getOrderNo())
@@ -272,7 +272,7 @@ public class OrderClothController extends BaseController {
 
     @Transactional(rollbackFor = Exception.class)
     @ApiOperation("同城配送派单")
-    @GetMapping(value = "setIntracityExpress")
+    @GetMapping(value = "/setIntracityExpress")
     public R setIntracityExpress(@RequestParam String orderNo) throws Exception {
         OrderCloth orderCloth = orderClothService.getOne(new QueryWrapper<OrderCloth>().lambda()
                 .eq(OrderCloth::getOrderNo, orderNo)
@@ -341,7 +341,7 @@ public class OrderClothController extends BaseController {
 
     @Transactional(rollbackFor = Exception.class)
     @ApiOperation("分配送衣配送员")
-    @GetMapping(value = "setSendDelivery")
+    @GetMapping(value = "/setSendDelivery")
     public R setSendDelivery(@RequestParam String orderNo, @RequestParam Long deliveryManId) throws Exception {
         OrderCloth orderCloth = orderClothService.getOne(new QueryWrapper<OrderCloth>().lambda()
                 .eq(OrderCloth::getOrderNo, orderNo)
@@ -392,7 +392,7 @@ public class OrderClothController extends BaseController {
 
     @Transactional(rollbackFor = Exception.class)
     @ApiOperation("取衣")
-    @GetMapping(value = "takeCloth")
+    @GetMapping(value = "/takeCloth")
     public R takeCloth(@RequestParam String washCodes, @RequestParam Long orderId) throws Exception {
         OrderCloth orderCloth = orderClothService.getOne(new QueryWrapper<OrderCloth>().lambda()
                 .eq(OrderCloth::getId, orderId)
@@ -429,7 +429,7 @@ public class OrderClothController extends BaseController {
     }
 
     @ApiOperation("根据订单编号订单明细")
-    @GetMapping(value = "getInfoByOrderNo")
+    @GetMapping(value = "/getInfoByOrderNo")
     public R<OrderClothVO> getInfoByOrderNo(@RequestParam @ApiParam("订单编号") String orderNo) throws Exception {
         LambdaQueryWrapper<OrderCloth> queryWrapper = new QueryWrapper<OrderCloth>().lambda()
                 .eq(OrderCloth::getOrderNo, orderNo);
@@ -472,7 +472,7 @@ public class OrderClothController extends BaseController {
     }
 
     @ApiOperation("根据订单编号获取预约订单明细")
-    @GetMapping(value = "getAppointmentInfoByOrderNo")
+    @GetMapping(value = "/getAppointmentInfoByOrderNo")
     public R<OrderCloth> getAppointmentInfoByOrderNo(@RequestParam @ApiParam("订单编号") String orderNo
             , @RequestParam @ApiParam("用户ID") Long appUserId) throws Exception {
         return R.ok(orderClothService.getOne(new QueryWrapper<OrderCloth>().lambda()
@@ -485,7 +485,7 @@ public class OrderClothController extends BaseController {
     @Transactional(rollbackFor = Exception.class)
     @PreAuthorize("@ss.hasPermi('order:cloth:collectCloth')")
     @ApiOperation("创建收衣订单")
-    @PostMapping(value = "collectCloth")
+    @PostMapping(value = "/collectCloth")
     public R<OrderCloth> collectCloth(@Valid @RequestBody OrderClothDTO orderClothDTO) throws Exception {
         Long defaultWashSpeed = Long.parseLong(configService.selectConfigByKey(SysConfigKey.OrderClothDefaultSpeed.getCode()));
         if (orderClothDTO.getSpeedId() == null) {
@@ -502,7 +502,7 @@ public class OrderClothController extends BaseController {
     @Transactional(rollbackFor = Exception.class)
     @PreAuthorize("@ss.hasPermi('order:cloth:collectCloth')")
     @ApiOperation("订单付款")
-    @PostMapping(value = "clothOrderPay")
+    @PostMapping(value = "/clothOrderPay")
     public R<OrderPayResultVO> clothOrderPay(@Valid @RequestBody OrderClothPayDTO orderClothPayDTO) throws Exception {
         return R.ok(orderClothService.clothOrderPay(orderClothPayDTO));
     }
@@ -528,13 +528,13 @@ public class OrderClothController extends BaseController {
 
     @Transactional(rollbackFor = Exception.class)
     @ApiOperation("撤单")
-    @GetMapping(value = "refund")
+    @GetMapping(value = "/refund")
     public R refundOrder(@RequestParam Long orderId) throws Exception {
         orderClothService.refundOrderApply(orderId, getLoginUser().getUsername() + "撤单");
         return R.ok(null, "撤单提交成功");
     }
 
-    @PostMapping("getSendClothOrderList")
+    @PostMapping("/getSendClothOrderList")
     @ApiOperation(value = "查询取衣订单")
     public R<Page<OrderClothQueryVO>> getSendClothOrderList(@RequestBody OrderClothQueryDTO orderClothQueryDTO) throws Exception {
         LambdaQueryWrapper<OrderCloth> queryWrapper = new QueryWrapper<OrderCloth>().lambda()
@@ -580,7 +580,7 @@ public class OrderClothController extends BaseController {
      * 查询洗衣订单列表
      */
     @PreAuthorize("@ss.hasPermi('order:cloth:list')")
-    @GetMapping("list")
+    @GetMapping("/list")
     @ApiOperation(value = "查询洗衣订单列表")
     public R list(OrderClothQueryDTO orderClothQueryDTO) throws Exception {
         LambdaQueryWrapper<OrderCloth> queryWrapper = new QueryWrapper<OrderCloth>().lambda()
@@ -605,14 +605,6 @@ public class OrderClothController extends BaseController {
         if (StringUtils.isNotEmpty(orderClothQueryDTO.getIsAppointment())) {
             queryWrapper.eq(OrderCloth::getIsAppointment, orderClothQueryDTO.getIsAppointment());
         }
-//        queryWrapper.and(orderClothLambdaQueryWrapper -> orderClothLambdaQueryWrapper
-//                .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.WAITING_FOR_PAY.getCode()).or()
-//                .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.WASHING.getCode()).or()
-//                .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.HAS_WASH.getCode()).or()
-//                .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.WAITING_TO_SEND.getCode()).or()
-//                .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.SENDING.getCode()).or()
-//                .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.WAITING_FOR_COMMENT.getCode()).or()
-//                .eq(OrderCloth::getOrderStatus, ClothOrderStatusType.FINISH.getCode()));
         if (StringUtils.isNotEmpty(orderClothQueryDTO.getOrderStatus())) {
             if (ClothOrderStatusType.FINISH.getCode().equals(orderClothQueryDTO.getOrderStatus())) {
                 queryWrapper.and(orderClothLambdaQueryWrapper -> orderClothLambdaQueryWrapper

yiqi-common/src/main/java/com/yiqi/common/enums/ClothOrderFlowStatus.java

@@ -10,11 +10,11 @@ public enum ClothOrderFlowStatus implements CodeEnum{
     inFactory("1", "已入厂"),
     checkCloth("2", "已检查"),
     outFactory("3", "已出厂"),
-    hangering("4", "上挂中"),
+    hangering("4", "已上挂"),
     hasTake("5","已取衣"),
-    reWash("100", "工厂重洗"),
-    deleteInFactory("101","删除入厂"),
-    refund("102","撤单"),
+    deleteInFactory("11","取消入厂"),
+    reWash("12", "工厂重洗"),
+    refund("-1","撤单"),
     ;
 
     private final String code;

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderClothServiceImpl.java

@@ -292,30 +292,17 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
         }
 
         //如果为总部查询，需要带上组织信息返回
-        if (SourceType.MANAGER.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
-            Map<Long, SysOrg> storeOrgMap = new HashMap<>();
-            Map<Long, SysOrg> factoryOrgMap = new HashMap<>();
-            if (page.getRecords().stream().filter(orderCloth -> SourceType.STORE.getCode()
-                    .equals(orderCloth.getSourceType())).collect(Collectors.toList()).size() > 0) {
-                storeOrgMap = sysOrgService.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getSourceType
-                                , SourceType.STORE.getCode()).in(SysOrg::getId, page.getRecords().stream()
-                                .map(OrderCloth::getOrgId).collect(Collectors.toSet()))).stream()
-                        .collect(Collectors.toMap(SysOrg::getId, SysOrg -> SysOrg));
-            }
-            if (page.getRecords().stream().filter(orderCloth -> SourceType.FACTORY.getCode()
-                    .equals(orderCloth.getSourceType())).collect(Collectors.toList()).size() > 0) {
-                factoryOrgMap = sysOrgService.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getSourceType
-                                , SourceType.FACTORY.getCode()).in(SysOrg::getId, page.getRecords().stream()
-                                .map(OrderCloth::getOrgId).collect(Collectors.toSet()))).stream()
-                        .collect(Collectors.toMap(SysOrg::getId, SysOrg -> SysOrg));
-            }
-            for (OrderClothQueryVO orderClothQueryVO : orderClothQueryVOS) {
-                if (SourceType.STORE.getCode().equals(orderClothQueryVO.getSourceType())) {
-                    orderClothQueryVO.setSysOrg(storeOrgMap.get(orderClothQueryVO.getOrgId()));
-                } else if (SourceType.FACTORY.getCode().equals(orderClothQueryVO.getSourceType())) {
-                    orderClothQueryVO.setSysOrg(factoryOrgMap.get(orderClothQueryVO.getOrgId()));
-                }
-            }
+        Map<Long, SysOrg> storeOrgMap = new HashMap<>();
+        Map<Long, SysOrg> factoryOrgMap = new HashMap<>();
+        if (page.getRecords().stream().filter(orderCloth -> SourceType.STORE.getCode()
+                .equals(orderCloth.getSourceType())).collect(Collectors.toList()).size() > 0) {
+            storeOrgMap = sysOrgService.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getSourceType
+                            , SourceType.STORE.getCode()).in(SysOrg::getId, page.getRecords().stream()
+                            .map(OrderCloth::getOrgId).collect(Collectors.toSet()))).stream()
+                    .collect(Collectors.toMap(SysOrg::getId, SysOrg -> SysOrg));
+        }
+        for (OrderClothQueryVO orderClothQueryVO : orderClothQueryVOS) {
+            orderClothQueryVO.setSysOrg(storeOrgMap.get(orderClothQueryVO.getOrgId()));
         }
         Page<OrderClothQueryVO> orderClothQueryVOPage = new Page<>();
         orderClothQueryVOPage.setRecords(orderClothQueryVOS);

yiqi-core/src/main/resources/mapper/core/GoodsSkuMapper.xml

@@ -72,7 +72,7 @@
         from goods_sku_store a
         left join goods_sku b on b.id = a.goods_sku_id
         left join sys_store c on c.id = a.target_id
-        left join goods_sku_store d on a.goods_sku_id = d.goods_sku_id and d.source_type = '01' and d.target_id = c.factory_id
+        left join goods_sku_store d on a.goods_sku_id = d.goods_sku_id and d.source_type = '02' and d.target_id = c.factory_id
         where b.del_flag = 0
         <if test="goodsId != null  and goodsId != ''">
             and  b.goods_id = #{goodsId}