调整

gly-base-core/src/main/java/cn/com/taiji/core/entity/ass/AssOrderSignOut.java

@@ -0,0 +1,80 @@
+package cn.com.taiji.core.entity.ass;
+
+import javax.persistence.*;
+
+import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
+import lombok.Getter;
+import lombok.Setter;
+@Getter
+@Setter
+@Entity
+@Table(name = "ASS_ORDER_SIGNOUT")
+public class AssOrderSignOut extends AbstractStringPropertyUUIDEntity {
+
+    @Column(name = "ORDER_ID", length = 255)
+    private String orderId; // 订单id
+
+    @Column(name = "HAS_CARD", precision = 1)
+    private Integer hasCard; // 是否有卡，1：有卡，0：无卡
+
+    @Column(name = "HAS_OBU", precision = 1)
+    private Integer hasObu; // 是否有签，1：有签，0：无签
+
+    @Column(name = "COS_PROVIDER", precision = 1, nullable = false)
+    private Integer cosProvider; // 是否写卡，1：需要写卡
+
+    @Column(name = "NEED_PAY", precision = 1, nullable = false)
+    private Integer needPay; // 是否支付
+
+    @Column(name = "SIGN_OUT_REASON", length = 300)
+    private String signOutReason; // 注销原因
+
+    @Column(name = "CANCEL_STEP")
+    private String cancelStep; // 注销原因
+
+    @Column(name = "LICENSE_FRONT_URL", length = 500, nullable = false)
+    private String licenseFrontUrl; // 行驶证正面
+
+    @Column(name = "LICENSE_REVERSE_URL", length = 500, nullable = false)
+    private String licenseReverseUrl; // 行驶证反面
+
+    @Column(name = "AGENCY_REASON", length = 1024)
+    private String agencyReason; // 渠道检测未通过原因
+
+    @Column(name = "REFUND_INFO_ID", length = 64)
+    private String refundInfoId; // 退费信息id
+
+    @Column(name = "BANK_NAME", length = 32)
+    private String bankName; // 开户行名称
+
+    @Column(name = "BANK_PROVINCE", length = 4)
+    private String bankProvince; // 开户行省份
+
+    @Column(name = "BANK_BRANCH_NAME", length = 64)
+    private String bankBranchName; // 开户行支行名称
+
+    @Column(name = "BANK_ID_CODE", length = 32)
+    private String bankIdCode; // 银行卡号
+
+    @Column(name = "USER_NAME", length = 64)
+    private String userName; // 持卡人姓名
+
+    @Column(name = "USER_MOBILE", length = 32)
+    private String userMobile; // 持卡人手机号
+
+    @Column(name = "PROXY_URL", length = 256)
+    private String proxyUrl; // 授权书地址
+
+    @Column(name = "USER_POS_URL", length = 256)
+    private String userPosUrl; // 身份证正面地址
+
+    @Column(name = "USER_NEG_URL", length = 256)
+    private String userNegUrl; // 身份证反面地址
+
+    @Column(name = "VEHICLE_POS_URL", length = 256)
+    private String vehiclePosUrl; // 行驶证正面地址
+
+    @Column(name = "VEHICLE_NEG_URL", length = 256)
+    private String vehicleNegUrl; // 行驶证反面地址
+}

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/manager/importReview/MessageImportManagerImpl.java

@@ -90,7 +90,11 @@ public class MessageImportManagerImpl extends AbstractCommManager implements Mes
             // 2.3、审核通过后，执行批量信息发送
             MessageImportSendRequestDto importSendRequest = new MessageImportSendRequestDto();
             importSendRequest.setExcelUrl(apply.getAttachmentUrl());
-            importSendRequest.setSendTime(apply.getSendTime());
+            if (apply.getSendTime() == null){
+                importSendRequest.setSendTime(LocalDateTime.now());
+            } else {
+                importSendRequest.setSendTime(apply.getSendTime());
+            }
             importSendRequest.setApplyId(apply.getId());
             try {
                 // 2.5 选择指定消息和通道 批量信息发送

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/tools/WxRequestAccessTokenUtil.java

@@ -68,12 +68,14 @@ public class WxRequestAccessTokenUtil {
                 throw new RuntimeException(e);
             }
             WxAccessTokenModel tokenModel = JSONUtil.parseObj(resJson).toBean(WxAccessTokenModel.class);
+            System.out.println("----------------------------------" + resJson + "----------------------------------");
+            System.out.println("----------------------------------" + tokenModel + "----------------------------------");
             //3、responseBody非空校验
             if (tokenModel == null ) {
                 throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("获取微信小程序accessToken失败，请重试！");
             }
             //4、微信回参，是否成功调用校验
-            if (tokenModel.getErrCode() != null) {
+            if (tokenModel.getErrCode() != null && tokenModel.getErrCode() != 0) {
                 logger.error("获取微信小程序accessToken失败！原因：{}", (String) tokenModel.getErrMsg());
                 throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("获取微信小程序accessToken失败！");
             }