Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-issuer

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/weiXin/AtsGetWeChatOpenIdRequest.java

@@ -18,7 +18,7 @@ import javax.validation.constraints.NotBlank;
 public class AtsGetWeChatOpenIdRequest extends AbstractAtsRequest<AtsGetWeChatOpenIdResponse> {
 
     public AtsGetWeChatOpenIdRequest() {
-        super(WeiXinServiceCmd.GETWECHATOPENDI);
+        super(WeiXinServiceCmd.GETWECHATOPENID);
     }
 
     @NotBlank

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/weiXin/WeiXinServiceCmd.java

@@ -17,7 +17,7 @@ public enum WeiXinServiceCmd implements SignServiceCommand {
     VEHICLEUSERSTATE("微信V2车主状态查询及获取签约参数","vehicleUserState", AtsVehicleUserStateRequest.class),
     VEHICLESIGNV3("微信V3获取预开通用户ETC扣费签约参数","vehicleSignV3", AtsVehicleSignV3Request.class),
     VEHICLESIGNRESULTV3("微信V3ETC签约状态查询","vehicleSignResultV3", AtsVehicleSignV3ResultRequest.class),
-    GETWECHATOPENDI("微信小程序登录-获取用户openID","getWeChatOpenId", AtsGetWeChatOpenIdRequest.class),
+    GETWECHATOPENID("微信小程序登录-获取用户openID","getWeChatOpenId", AtsGetWeChatOpenIdRequest.class),
     WEIXINDEDUCTV2("微信V2扣款","weiXinDeDuctV2", AtsWxDeductV2Request.class),
     WEIXINDEDUCTV3("微信V3扣款","weiXinDeDuctV3", AtsWxDeductV3Request.class),
     WEIXINDEDUCTRESULTV2("微信V2扣款结果查询","weiXinDeDuctResultV2", AtsWxDeductResultV2Request.class),

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/issue/IssueOrderinfoRepo.java

@@ -46,4 +46,8 @@ public interface IssueOrderinfoRepo extends AbstractJpaRepo<IssueOrderinfo, Stri
             " and a.PRODUCT_NAME=?4 and a.VEHICLE_CLASS=?6 and a.CHANNEL_ID=?5 ")
     List<IssueOrderinfo> findByAgencyAll(String agencyId, LocalDateTime startTime, LocalDateTime endTime,
                                          String productName, String dotName, Integer vehicleType);
+
+    //通过订单号查询用户信息、车辆信息上传后的渠道订单
+    @Query("FROM IssueOrderinfo WHERE orderSource = 'CHANNEL' and orderStatus = 'NORMAL' and orderStep not in ('ORDER_INIT','CUSTOMER_UPLOAD','WAITING_AUDIT') and userId = ?1")
+    List<IssueOrderinfo> findAppQueryByOpenId(String openId);
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/api/issue/OrderController.java

@@ -11,6 +11,7 @@ import cn.com.taiji.core.model.comm.protocol.inss.inst.InstApplyResponse;
 import cn.com.taiji.core.model.comm.protocol.inss.inst.InstCallBackRequest;
 import cn.com.taiji.core.model.comm.protocol.inss.inst.InstCallBackResponse;
 import cn.com.taiji.iaw.api.MyValidController;
+import cn.com.taiji.iaw.dto.CommRequestDTO;
 import cn.com.taiji.iaw.dto.issue.order.*;
 import cn.com.taiji.iaw.manager.issue.IssueOrderManage;
 import io.swagger.annotations.Api;
@@ -174,4 +175,11 @@ public class OrderController extends MyValidController {
         issueOrderManage.updateAdress(reqDto);
         return ApiResponse.success().setMessage("修改成功");
     }
+
+    @ApiOperation(value = "订单查询-小程序")
+    @PostMapping(value = "/orderQuery")
+    public ApiResponse<OrderQueryResponseDTO> orderQuery(@RequestBody @Valid CommRequestDTO request) throws ManagerException {
+        OrderQueryResponseDTO response = issueOrderManage.orderQuery(request);
+        return ApiResponse.of(response);
+    }
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/issue/order/OrderQueryResponseDTO.java

@@ -0,0 +1,18 @@
+package cn.com.taiji.iaw.dto.issue.order;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+ * @Author : cehnchaod
+ * @Date: 2025/1/10 21:25
+ * @Description:
+ */
+@ApiModel(description = "订单查询响应")
+@Data
+public class OrderQueryResponseDTO {
+
+    @ApiModelProperty(value = "true有渠道订单，false无")
+    private Boolean hasQd;
+
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/issue/IssueOrderManage.java

@@ -10,6 +10,7 @@ import cn.com.taiji.core.model.comm.protocol.inss.inst.InstApplyRequest;
 import cn.com.taiji.core.model.comm.protocol.inss.inst.InstApplyResponse;
 import cn.com.taiji.core.model.comm.protocol.inss.inst.InstCallBackRequest;
 import cn.com.taiji.core.model.comm.protocol.inss.inst.InstCallBackResponse;
+import cn.com.taiji.iaw.dto.CommRequestDTO;
 import cn.com.taiji.iaw.dto.issue.order.*;
 
 /**
@@ -60,4 +61,6 @@ public interface IssueOrderManage {
     UpAdressQueryResDTO upAdressQuery(OrderDetailReqDto reqDto) throws ManagerException;
 
     PayAfterOrderResDTO payAfterOrder(OrderDetailReqDto reqDto) throws ManagerException;
+
+    OrderQueryResponseDTO orderQuery(CommRequestDTO request) throws ServiceHandleException;
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/issue/IssueOrderManageImpl.java

@@ -25,6 +25,7 @@ import cn.com.taiji.core.repo.jpa.ass.AssAgencyConfigRepo;
 import cn.com.taiji.core.repo.jpa.comm.SatisfactionRepo;
 import cn.com.taiji.core.repo.jpa.issue.*;
 import cn.com.taiji.core.repo.jpa.user.StaffRepo;
+import cn.com.taiji.iaw.dto.CommRequestDTO;
 import cn.com.taiji.iaw.dto.issue.order.*;
 import cn.com.taiji.iaw.manager.AbstractIawManager;
 import cn.com.taiji.iaw.repo.jpa.request.issue.IssueOrderaPageRequest;
@@ -479,6 +480,20 @@ public class IssueOrderManageImpl extends AbstractIawManager implements IssueOrd
         }
         return resDTO;
     }
+
+    @Override
+    public OrderQueryResponseDTO orderQuery(CommRequestDTO request) throws ServiceHandleException {
+        String openId = findOpenIdByToken(request.getAccessToken());
+        List<IssueOrderinfo> orderinfos = issueOrderinfoRepo.findAppQueryByOpenId(openId);
+        OrderQueryResponseDTO dto = new OrderQueryResponseDTO();
+        if (isEmpty(orderinfos)){
+            dto.setHasQd(false);
+        } else  {
+            dto.setHasQd(true);
+        }
+        return dto;
+    }
+
     //校验发行订单是否存在
     private IssueOrderinfo checkOrder(String orderNo) throws ManagerException {
         IssueOrderinfo order = issueOrderinfoRepo.findByOrderNo(orderNo);

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/handler/WinXinServiceHandler.java

@@ -92,7 +92,7 @@ public class WinXinServiceHandler extends AbstractAtsServiceHandler<WeiXinServic
                 return vehicleUserStateV3Manager.serviceHandle((AtsVehicleSignV3Request) request);
             case VEHICLESIGNRESULTV3:
                 return vehicleSignV3ResultManager.serviceHandle((AtsVehicleSignV3ResultRequest) request);
-            case GETWECHATOPENDI:
+            case GETWECHATOPENID:
                 return getWeChatOpenIdManager.serviceHandle((AtsGetWeChatOpenIdRequest) request);
             case WEIXINDEDUCTV2:
                 return weiXinDeductV2Manager.serviceHandle((AtsWxDeductV2Request) request);

zhywpt-service-inss/src/main/java/cn/com/taiji/inss/manager/inst/InstApplyManager.java

@@ -113,7 +113,9 @@ public class InstApplyManager extends RedisCacheManager implements LogManager<In
                 throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("卡已使用或已报损");
             }
             InvwWarehouse cardWarehouse = warehouseRepo.findByCode(cardDetail.getStoreCode());
-            if (cardWarehouse == null || EnableStatus.ENABLE != cardWarehouse.getStatus()) {
+            if (cardWarehouse == null){
+                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("卡仓库不存在！");
+            } else if (EnableStatus.ENABLE != cardWarehouse.getStatus()) {
                 throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException(cardWarehouse.getName() + "仓库已禁用：" + cardDetail.getStoreCode());
             } else if (cardWarehouse.getIsCheck() != null && cardWarehouse.getIsCheck() == 1
                     && !cardWarehouse.getAgencyId().equals(orderInfo.getAgencyId())) {
@@ -130,7 +132,9 @@ public class InstApplyManager extends RedisCacheManager implements LogManager<In
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("OBU已使用或已报损");
         }
         InvwWarehouse obuWarehouse = warehouseRepo.findByCode(obuDetail.getStoreCode());
-        if (obuWarehouse == null || EnableStatus.ENABLE != obuWarehouse.getStatus()) {
+        if (obuWarehouse == null){
+            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("仓库不存在！");
+        }else if ( EnableStatus.ENABLE != obuWarehouse.getStatus()) {
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException(obuWarehouse.getName() + "仓库已禁用：" + obuDetail.getStoreCode());
         } else if (obuWarehouse.getIsCheck() != null && obuWarehouse.getIsCheck() == 1
                 && !obuWarehouse.getAgencyId().equals(orderInfo.getAgencyId())) {