附件增加洗衣状态

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

@@ -125,9 +125,11 @@ public class OrderClothController extends BaseController {
     @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.MANAGER.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
+        if(SourceType.FACTORY.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
+            queryWrapper.eq(OrderCloth::getFactoryId, SecurityUtils.getLoginUser().getOrgId());
+        }
+        if(SourceType.STORE.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
             queryWrapper.eq(OrderCloth::getOrgId, SecurityUtils.getLoginUser().getOrgId());
-            queryWrapper.eq(OrderCloth::getSourceType, SecurityUtils.getLoginUser().getSourceType());
         }
         OrderCloth orderCloth = orderClothService.getOne(queryWrapper);
         if (orderCloth == null) {
@@ -426,9 +428,11 @@ public class OrderClothController extends BaseController {
     public R<OrderClothVO> getInfoByOrderNo(@RequestParam @ApiParam("订单编号") String orderNo) throws Exception {
         LambdaQueryWrapper<OrderCloth> queryWrapper = new QueryWrapper<OrderCloth>().lambda()
                 .eq(OrderCloth::getOrderNo, orderNo);
-        if (!SourceType.MANAGER.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
-            queryWrapper.eq(OrderCloth::getSourceType, SecurityUtils.getLoginUser().getSourceType())
-                    .eq(OrderCloth::getOrgId, SecurityUtils.getLoginUser().getOrgId());
+        if(SourceType.FACTORY.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
+            queryWrapper.eq(OrderCloth::getFactoryId, SecurityUtils.getLoginUser().getOrgId());
+        }
+        if(SourceType.STORE.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
+            queryWrapper.eq(OrderCloth::getOrgId, SecurityUtils.getLoginUser().getOrgId());
         }
         OrderCloth orderCloth = orderClothService.getOne(queryWrapper);
         if (orderCloth == null) {
@@ -584,12 +588,11 @@ public class OrderClothController extends BaseController {
         LambdaQueryWrapper<OrderCloth> queryWrapper = new QueryWrapper<OrderCloth>().lambda()
                 .eq(OrderCloth::getDelFlag, DeleteStatus.OK.getCode())
                 .ne(OrderCloth::getRefundStatus, OrderRefundStatus.REFUND_SUCCESS.getCode());
-        if (!SourceType.MANAGER.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
-            queryWrapper.eq(OrderCloth::getSourceType, SecurityUtils.getLoginUser().getSourceType());
+        if(SourceType.FACTORY.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
+            queryWrapper.eq(OrderCloth::getFactoryId, SecurityUtils.getLoginUser().getOrgId());
+        }
+        if(SourceType.STORE.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
             queryWrapper.eq(OrderCloth::getOrgId, SecurityUtils.getLoginUser().getOrgId());
-        } else if (orderClothQueryDTO.getOrgId() != null) {
-            queryWrapper.eq(OrderCloth::getOrgId, orderClothQueryDTO.getOrgId());
-            queryWrapper.eq(OrderCloth::getSourceType, orderClothQueryDTO.getSourceType());
         }
         if (StringUtils.isNotEmpty(orderClothQueryDTO.getOrderType())) {
             queryWrapper.eq(OrderCloth::getOrderType, orderClothQueryDTO.getOrderType());
@@ -676,12 +679,11 @@ public class OrderClothController extends BaseController {
         LambdaQueryWrapper<OrderCloth> queryWrapper = new QueryWrapper<OrderCloth>().lambda()
                 .eq(OrderCloth::getDelFlag, DeleteStatus.OK.getCode())
                 .ne(OrderCloth::getRefundStatus, OrderRefundStatus.REFUND_SUCCESS.getCode());
-        if (!SourceType.MANAGER.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
-            queryWrapper.eq(OrderCloth::getSourceType, SecurityUtils.getLoginUser().getSourceType());
+        if(SourceType.FACTORY.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
+            queryWrapper.eq(OrderCloth::getFactoryId, SecurityUtils.getLoginUser().getOrgId());
+        }
+        if(SourceType.STORE.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
             queryWrapper.eq(OrderCloth::getOrgId, SecurityUtils.getLoginUser().getOrgId());
-        } else if (orderClothQueryDTO.getOrgId() != null) {
-            queryWrapper.eq(OrderCloth::getOrgId, orderClothQueryDTO.getOrgId());
-            queryWrapper.eq(OrderCloth::getSourceType, orderClothQueryDTO.getSourceType());
         }
         if (StringUtils.isNotEmpty(orderClothQueryDTO.getOrderType())) {
             queryWrapper.eq(OrderCloth::getOrderType, orderClothQueryDTO.getOrderType());
@@ -879,8 +881,10 @@ public class OrderClothController extends BaseController {
                         ClothOrderStatusType.HAS_TO_DOOR.getCode(),
                         ClothOrderStatusType.HAS_TAKING.getCode(),
                         ClothOrderStatusType.CANCEL);
-        if (!SourceType.MANAGER.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
-            queryWrapper.eq(OrderCloth::getSourceType, SecurityUtils.getLoginUser().getSourceType());
+        if(SourceType.FACTORY.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
+            queryWrapper.eq(OrderCloth::getFactoryId, SecurityUtils.getLoginUser().getOrgId());
+        }
+        if(SourceType.STORE.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
             queryWrapper.eq(OrderCloth::getOrgId, SecurityUtils.getLoginUser().getOrgId());
         }
         if (StringUtils.isNotEmpty(orderClothCountConsumeQueryDTO.getOrderNo())) {
@@ -969,8 +973,10 @@ public class OrderClothController extends BaseController {
                 .ge(BaseEntity::getCreateTime, orderClothCountConsumeQueryDTO.getBeginCreateTime())
                 .lt(BaseEntity::getCreateTime, DateUtils.addDays(orderClothCountConsumeQueryDTO.getEndCreateTime(), 1))
                 .ne(OrderCloth::getRefundStatus, OrderRefundStatus.REFUND_SUCCESS.getCode());
-        if (!SourceType.MANAGER.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
-            queryWrapper.eq(OrderCloth::getSourceType, SecurityUtils.getLoginUser().getSourceType());
+        if(SourceType.FACTORY.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
+            queryWrapper.eq(OrderCloth::getFactoryId, SecurityUtils.getLoginUser().getOrgId());
+        }
+        if(SourceType.STORE.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
             queryWrapper.eq(OrderCloth::getOrgId, SecurityUtils.getLoginUser().getOrgId());
         }
         if (StringUtils.isNotEmpty(orderClothCountConsumeQueryDTO.getOrderNo())) {

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

@@ -879,9 +879,11 @@ public class OrderClothItemController extends BaseController {
     public R<OrderClothItemVO> getInfo(@PathVariable("id") Long id) {
         LambdaQueryWrapper<OrderClothItem> queryWrapper = new QueryWrapper<OrderClothItem>().lambda()
                 .eq(OrderClothItem::getId, id);
-        if (!SourceType.MANAGER.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
-            queryWrapper.eq(OrderClothItem::getSourceType, SecurityUtils.getLoginUser().getSourceType())
-                    .eq(OrderClothItem::getOrgId, SecurityUtils.getLoginUser().getOrgId());
+        if(SourceType.FACTORY.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
+            queryWrapper.eq(OrderClothItem::getFactoryId, SecurityUtils.getLoginUser().getOrgId());
+        }
+        if(SourceType.STORE.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
+            queryWrapper.eq(OrderClothItem::getOrgId, SecurityUtils.getLoginUser().getOrgId());
         }
         OrderClothItem orderClothItem = orderClothItemService.getOne(queryWrapper
         );

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

@@ -413,9 +413,11 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
     public void refundOrderApply(Long orderId, String remark) {
         LambdaQueryWrapper<OrderCloth> queryWrapper = new QueryWrapper<OrderCloth>().lambda()
                 .eq(OrderCloth::getId, orderId);
-        if (!SourceType.MANAGER.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
-            queryWrapper.eq(OrderCloth::getSourceType, SecurityUtils.getLoginUser().getSourceType())
-                    .eq(OrderCloth::getOrgId, SecurityUtils.getLoginUser().getOrgId());
+        if(SourceType.FACTORY.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
+            queryWrapper.eq(OrderCloth::getFactoryId, SecurityUtils.getLoginUser().getOrgId());
+        }
+        if(SourceType.STORE.getCode().equals(SecurityUtils.getLoginUser().getSourceType())){
+            queryWrapper.eq(OrderCloth::getOrgId, SecurityUtils.getLoginUser().getOrgId());
         }
         OrderCloth orderCloth = getOne(queryWrapper);
         if (orderCloth == null) {