添加 authCode 微信扫码下单

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinOrderParam.java

@@ -20,7 +20,7 @@ public class GoblinOrderParam {
     @ApiModelProperty(value = "支付类型")
     @NotNull(message = "支付类型不能为空")
     private String payType;
-    @ApiModelProperty(value = "支付来源")
+    @ApiModelProperty(value = "支付来源 [新增micropay-微信扫码支付]")
     @NotNull(message = "支付来源不能为空")
     private String deviceFrom;
     @ApiModelProperty(value = "openId")
@@ -31,6 +31,8 @@ public class GoblinOrderParam {
     private String returnUrl;
     @ApiModelProperty(value = "用户id")
     private String uid;
+    @ApiModelProperty(value = "扫码枪code")
+    private String authCode;
 
 
     @ApiModelProperty(value = "商品相关参数集合")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinOrderPreParam.java

@@ -34,6 +34,7 @@ public class GoblinOrderPreParam implements Cloneable{
     private int expireTime;
 
     private String deviceFrom;
+    private String authCode;
     private String payType;
     private String openId;
     private String returnUrl;

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderServiceImpl.java

@@ -67,6 +67,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
 
         String orderMasterCode = IDGenerator.storeMasterCode();//总订单id
         GoblinOrderPreParam preParam = GoblinOrderPreParam.getNew();
+        preParam.setAuthCode(param.getAuthCode());
         preParam.setPayType(param.getPayType());
         preParam.setDeviceFrom(param.getDeviceFrom());
         preParam.setOpenId(param.getOpenId());
@@ -361,6 +362,10 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             httpData.add("expireTime", preParam.getExpireTime() + "");
             httpData.add("payType", preParam.getPayType());
             httpData.add("deviceFrom", preParam.getDeviceFrom());
+
+            if (preParam.getDeviceFrom().equals("micropay")) {
+                httpData.add("authCode", preParam.getAuthCode());
+            }
             if (preParam.getDeviceFrom().equals("js") || preParam.getDeviceFrom().equals("applet")) {
                 httpData.add("openId", preParam.getOpenId());
             }