core

gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/minio/MinioUtil.java

@@ -10,6 +10,7 @@ import io.minio.BucketExistsArgs;
 import io.minio.GetObjectArgs;
 import io.minio.MinioClient;
 import io.minio.PutObjectArgs;
+import lombok.Getter;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -32,9 +33,11 @@ import java.util.UUID;
 @Component
 public class MinioUtil extends CommonAbstract {
 
+    @Getter
     @Value("${vmi-minio.url}")
     private String url; //内网访问地址
 
+    @Getter
     @Value("${vmi-minio.proxyNetworkAddr}")
     private String proxyUrl = "https://qtzl.etcjz.cn/";//代理地址，外网访问
 

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

@@ -44,6 +44,7 @@ public class AtsCreatPayOrderV2Request extends AbstractAtsRequest<AtsCreatPayOrd
     @NotNull
     private Integer totalFee;
     /**
+     * V2官方文档可能不正确，暂时就不要求必穿，H5必传和V3保持一直
      * <pre>
      * 字段名：终端IP.
      * 变量名：spbill_create_ip
@@ -53,7 +54,7 @@ public class AtsCreatPayOrderV2Request extends AbstractAtsRequest<AtsCreatPayOrd
      * 描述：APP和网页支付提交用户端ip，Native支付填调用微信支付API的机器IP。
      * </pre>
      */
-    @NotBlank
+//    @NotBlank
     private String spbillCreateIp;
 
     /**
@@ -148,8 +149,10 @@ public class AtsCreatPayOrderV2Request extends AbstractAtsRequest<AtsCreatPayOrd
             builder.validFieldNotBlank("openid", openid);
         }
 
+        builder.validNotBlank("spbillCreateIp",TradeType.MWEB.equals(tradeType),
+                spbillCreateIp,"当tradeType是'MWEB'时，需指定非空的spbillCreateIp值");
         builder.validNotBlank("sceneInfo",TradeType.MWEB.equals(tradeType),
-                sceneInfo,"当tradeType是'MWEB'时，需指定非空的tradeType值");
+                sceneInfo,"当tradeType是'MWEB'时，需指定非空的sceneInfo值");
         builder.validNotBlank("productId",TradeType.NATIVE.equals(tradeType),
                 productId,"当tradeType是'NATIVE'时，需指定非空的productId值");
     }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/ass/AssServiceCmd.java

@@ -3,6 +3,7 @@ package cn.com.taiji.core.model.comm.protocol.ias.ass;
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
 import cn.com.taiji.core.model.comm.protocol.SignServiceCommand;
 import cn.com.taiji.core.model.comm.protocol.SignServiceType;
+import cn.com.taiji.core.model.comm.protocol.ats.weiXin.WeiXinServiceCmd;
 import cn.com.taiji.core.model.comm.protocol.ias.IasServiceType;
 
 public enum AssServiceCmd implements SignServiceCommand {
@@ -37,8 +38,8 @@ public enum AssServiceCmd implements SignServiceCommand {
     }
 
     @Override
-    public boolean isMyCommand(String fileName) {
-        return false;
+    public boolean isMyCommand(String ifCode) {
+        return this == fromIfCode(ifCode);
     }
 
     @Override

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/order/OrderPayApplyRequest.java

@@ -24,9 +24,9 @@ public class OrderPayApplyRequest extends AbstractSignTypeRequest<OrderPayApplyR
 //    @NotBlank
 //    private String openId;
     private String subOpenId;// 原wxOpenId
-    @NotBlank
-    private String spbillCreateIp;// 页面IP
-    private String h5Type;// h5页面类型
+
+    private String spbillCreateIp;// 页面IP h5支付必填
+    private String h5Type;// h5页面类型 h5支付必填
 
     public void relatedValid(ErrorMsgBuilder builder) {
     }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/order/OrderPayApplyResponse.java

@@ -16,8 +16,9 @@ public class OrderPayApplyResponse extends AbstractSignTypeResponse {
     private String partnerId;// 商户号
     private String prepayId;// 预支付交易会话ID
     private String wxPackage;// 订单详情扩展字符串
-    private String noncestr;// 随机字符串
-    private String timestamp;// 时间戳
+    private String nonceStr;// 随机字符串
+    private String timeStamp;// 时间戳
+    private String paySign;
     private String sign;// 签名
     private String signType;// 签名方式
     private String h5Url;// H5参数

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/order/OrderPayQueryModel.java

@@ -12,8 +12,8 @@ public class OrderPayQueryModel extends BaseModel {
 
     /** 订单编号 */
     private String orderNo;
-    /** 支付订单编号 */
-    private String payOrderNo;
+    /** 支付表主键id */
+    private String orderPayId;
     /** 支付状态 */
     private OrderPayStatus payStatus;
     /** 支付时间 */

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/order/OrderServiceCmd.java

@@ -43,8 +43,8 @@ public enum OrderServiceCmd implements SignServiceCommand {
     }
 
     @Override
-    public boolean isMyCommand(String fileName) {
-        return false;
+    public boolean isMyCommand(String ifCode) {
+        return this == fromIfCode(ifCode);
     }
 
     @Override

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/order/SignQueryRequest.java

@@ -20,7 +20,7 @@ public class SignQueryRequest extends AbstractSignTypeRequest<SignQueryResponse>
     }
 
     @NotBlank
-    private String orderNo;
+    private String orderNo; //订单编号
     @NotNull
     @IntegerConstant(values = "1,2")
     private Integer signChannelType=1;// 1:微信小程序 2：支付宝小程序