提交

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueOrderPost.java

@@ -22,8 +22,7 @@ import java.time.LocalDateTime;
 @Table(name = "ISSUE_ORDER_POST")
 public class IssueOrderPost extends StringPropertyUUIDEntity {
 
-	@NotBlank
-	@Size(max = 20)
+	@NotNull
 	@Column(name = "ORDER_TYPE")
 	@Enumerated(EnumType.STRING)
 	private OrderType orderType;//订单类型

zhywpt-app-iaw/build.gradle

@@ -12,6 +12,7 @@ dependencies {
     implementation "${groupname}:ias-protocol:1.0.0-SNAPSHOT"
     implementation "${groupname}:ats-protocol:1.0.0-SNAPSHOT"
     implementation "${groupname}:bls-protocol:1.0.0-SNAPSHOT"
+    implementation "${groupname}:ods-protocol:1.0.0-SNAPSHOT"
     implementation "${groupname}:inss-protocol:1.0.0-SNAPSHOT"
     implementation "${groupname}:smp-protocol:1.0.0-SNAPSHOT"
     implementation('cn.com.taiji.common:sso-client:2.3.10.7')

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

@@ -14,7 +14,6 @@ import cn.com.taiji.core.entity.dict.issue.OrderType;
 import cn.com.taiji.core.entity.dict.issue.ShippingStatus;
 import cn.com.taiji.core.entity.dict.log.OperateType;
 import cn.com.taiji.core.entity.issue.*;
-import cn.com.taiji.core.entity.user.AccountInfo;
 import cn.com.taiji.core.entity.user.Staff;
 import cn.com.taiji.core.manager.tools.minio.MinioUtil;
 import cn.com.taiji.core.model.comm.protocol.ias.order.*;
@@ -202,8 +201,6 @@ public class IssueOrderManageImpl extends AbstractIawManager implements IssueOrd
         sysPersistOperateLog(OperateType.ORDER_AGREEPROTOCOL, order.getId(), reqDto.getOrderSource(), findOpenIdByToken(reqDto.getAccessToken()), "同意协议");
     }
 
-
-
     @Override
     public PayQueryResponseDTO payQuery(PayQueryRequestDTO reqDto) throws ManagerException {
         reqDto.validate();
@@ -305,8 +302,8 @@ public class IssueOrderManageImpl extends AbstractIawManager implements IssueOrd
     public void orderReceiveGoods(OrderDetailReqDto reqDto) throws ManagerException {
         IssueOrderinfo orderinfo = checkOrder(reqDto.getOrderNo());
         if (!IssueOrderStep.WAITING_RECEIVE.equals(orderinfo.getOrderStep()) ||
-                !ShippingStatus.WAIT_RECEIVING.equals(orderinfo.getShippingStatus())){
-            throw new ManagerException("当前订单阶段{"+orderinfo.getOrderStep().getStep()+"}不可收货");
+                !ShippingStatus.WAIT_RECEIVING.equals(orderinfo.getShippingStatus())) {
+            throw new ManagerException("当前订单阶段{" + orderinfo.getOrderStep().getStep() + "}不可收货");
         }
         List<IssueOrderPost> postList = issueOrderinfoPostRepo.findByOrderNoList(reqDto.getOrderNo(), OrderType.ISSUE);
         if (isEmpty(postList)) {

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

@@ -119,7 +119,7 @@ public class IssueOrderExamineManageImpl extends AbstractManagewManager implemen
                 }
             } else {
                 if (!ShippingStatus.NONE.equals(order.getShippingStatus())) {//需要邮寄
-                    order.setOrderStep(IssueOrderStep.WAITING_RECEIVE);
+                    order.setOrderStep(IssueOrderStep.WAITING_SEND);
                     order.setShippingStatus(ShippingStatus.WAIT_SHIPPING);
                 } else {
                     order.setOrderStep(IssueOrderStep.WAITING_ACTIVE);

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/audit/VerificationRuleManager.java

@@ -199,7 +199,7 @@ public class VerificationRuleManager extends AbstractCommManager {
      * @param msg 错误信息个性化前缀
      */
     public void ocrVarifyBusinessLicense(String name,String busNum, String imagUrl,StringBuilder builder, String msg) {
-        ocrVarifyBusinessLicense(name, busNum, imagUrl,null, builder, msg);
+        ocrVarifyBusinessLicense(name, busNum, imagUrl,"", builder, msg);
     }
 
     /**