Merge remote-tracking branch 'origin/master'

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/issueOrder/IssueOrderQueryController.java

@@ -61,12 +61,14 @@ public class IssueOrderQueryController extends MyValidController {
         issueOrderQueryManage.orderSend(reqDto);
         return ApiResponse.success().setMessage("发货成功");
     }
-    @ApiOperation(value = "换货申请")
-    @PostMapping(value = "/changeApply")
-    public ApiResponse<String> changeApply(@Valid @RequestBody ChangeApplyReqDTO reqDto) throws ManagerException {
-        issueOrderQueryManage.changeApply(reqDto);
-        return ApiResponse.of("申请成功,请立即审核");
-    }
+    //20250807——PC端只有审核功能（此功能去掉）
+//    @Deprecated
+//    @ApiOperation(value = "换货申请")
+//    @PostMapping(value = "/changeApply")
+//    public ApiResponse<String> changeApply(@Valid @RequestBody ChangeApplyReqDTO reqDto) throws ManagerException {
+//        issueOrderQueryManage.changeApply(reqDto);
+//        return ApiResponse.of("申请成功,请立即审核");
+//    }
 
     @ApiOperation(value = "换货申请——查询")
     @PostMapping(value = "/changeQuery")
@@ -82,12 +84,14 @@ public class IssueOrderQueryController extends MyValidController {
         return ApiResponse.success();
     }
 
-    @ApiOperation(value = "退货申请")
-    @PostMapping(value = "/returnApply")
-    public ApiResponse<String> orderReturnQuery(@Valid @RequestBody returnApplyReqDTO reqDto) throws ManagerException {
-        String msg = issueOrderQueryManage.returnApply(reqDto);
-        return ApiResponse.of(msg);
-    }
+    //20250807——PC端只有审核功能（此功能去掉）
+//    @Deprecated
+//    @ApiOperation(value = "退货申请")
+//    @PostMapping(value = "/returnApply")
+//    public ApiResponse<String> orderReturnQuery(@Valid @RequestBody returnApplyReqDTO reqDto) throws ManagerException {
+//        String msg = issueOrderQueryManage.returnApply(reqDto);
+//        return ApiResponse.of(msg);
+//    }
     @ApiOperation(value = "退货申请——查询")
     @PostMapping(value = "/orderReturn")
     public ApiResponse<OrderReturnResDTO> orderReturnQuery(@Valid @RequestBody ReChangeQueryReqDTO reqDto) throws ManagerException {

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/issueOrder/IssueOrderQueryManageImpl.java

@@ -5,6 +5,7 @@ import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.core.entity.basic.QtkAgency;
 import cn.com.taiji.core.entity.basic.QtkServiceHall;
+import cn.com.taiji.core.entity.dict.basic.CardType;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.entity.dict.basic.UserType;
 import cn.com.taiji.core.entity.dict.invw.InvDeviceStatus;
@@ -332,6 +333,13 @@ public class IssueOrderQueryManageImpl extends AbstractManagewManager implements
         if (!ShippingStatus.WAIT_SHIPPING.equals(order.getShippingStatus())) {
             throw new ManagerException("当前订单不可发货");
         }
+        //校验卡类型 23是非储值卡
+        if ("23".equals(reqDto.getCardId().substring(8,10)) && CardType.STORED_VALUE_CARD.equals(order.getCardType())){
+            throw new ManagerException("订单为储值卡办理，请发储值卡");
+        }
+        if (!"23".equals(reqDto.getCardId().substring(8,10)) && !CardType.STORED_VALUE_CARD.equals(order.getCardType())){
+            throw new ManagerException("卡类型与订单办理卡类型不符");
+        }
         CarObuDetails result = checkSendCardObu(reqDto.getCardId(), reqDto.getObuId());
 
         //=============================================业务操作=============
@@ -427,6 +435,14 @@ public class IssueOrderQueryManageImpl extends AbstractManagewManager implements
             IssueOrderPost issueOrderPost = null;
             //只有线上才会发货
             if (rechange.getRechangeMode() == 1){
+
+                //校验卡类型 23是非储值卡
+                if ("23".equals(reqDto.getNewCardId().substring(8,10)) && CardType.STORED_VALUE_CARD.equals(order.getCardType())){
+                    throw new ManagerException("订单为储值卡办理，请发储值卡");
+                }
+                if (!"23".equals(reqDto.getNewCardId().substring(8,10)) && !CardType.STORED_VALUE_CARD.equals(order.getCardType())){
+                    throw new ManagerException("卡类型与订单办理卡类型不符");
+                }
                 issueOrderPost = new IssueOrderPost();
                 issueOrderPost.setOrderType(OrderType.ISSUE);
                 issueOrderPost.setOrderNo(reqDto.getOrderNo());
@@ -444,6 +460,8 @@ public class IssueOrderQueryManageImpl extends AbstractManagewManager implements
                 issueOrderPost.setObuId(reqDto.getNewObuId());
                 issueOrderPost.setInfo(reqDto.getInfo());
                 issueOrderinfoPostRepo.persist(issueOrderPost);
+                order.setObuId(reqDto.getNewObuId());
+                order.setCardId(reqDto.getNewCardId());
                 order.setOrderStep(IssueOrderStep.WAITING_RECEIVE);
                 order.setShippingStatus(ShippingStatus.WAIT_RECEIVING);
                 rechange.setAuditInfo(reqDto.getInfo());