diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 7d139743c..f0286b2e2 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -167,8 +167,8 @@ public class WxUserGrantController extends BaseController { String systemInfo = map.get("systemInfo"); try { - String basicUserId = map.get("basicUserId"); - String merchantId = map.get("merchantId"); + String basicUserId = map.get("UId"); + String merchantId = map.get("MId"); if(StringUtils.isNotBlank(basicUserId)){ wxCUserFrom.setFromType(EnumCUserFrom.FROM_C_USER_BASIC_INFO.getCode()); wxCUserFrom.setFromId(Long.parseLong(basicUserId)); @@ -995,10 +995,10 @@ public class WxUserGrantController extends BaseController { if(StringUtils.isNotBlank(wxCUserBasicInfo.getQrCode())){ qrCode = wxCUserBasicInfo.getQrCode(); }else{ -// String param = wxCUserBasicInfo.getWeappScene(); -// ResultData resultData = qrCodeService.uploadQrcode(getTenantInfo(), 1, Constant.mainPageUrl, param, 0, "", "", "用户分享",EnumPayWay.PAY_WAY_WECHAT); - String weappPath = wxCUserBasicInfo.getWeappPath(); - ResultData resultData = qrCodeService.uploadQrcode(getTenantInfo(), 0, weappPath, "", 0, "", "", "用户分享",EnumPayWay.PAY_WAY_WECHAT); + String param = wxCUserBasicInfo.getWeappScene(); + ResultData resultData = qrCodeService.uploadQrcode(getTenantInfo(), 1, Constant.mainPageUrl, param, 0, "", "", "用户分享",EnumPayWay.PAY_WAY_WECHAT); +// String weappPath = wxCUserBasicInfo.getWeappPath(); +// ResultData resultData = qrCodeService.uploadQrcode(getTenantInfo(), 0, weappPath, "", 0, "", "", "用户分享",EnumPayWay.PAY_WAY_WECHAT); Map map = (Map) resultData.data; if(map!=null && map.get("url") !=null) { String url = map.get("url"); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index 243d4214b..7313f9b51 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -139,13 +139,13 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { public String getWeappPath() { if(id == null) return Constant.mainPageUrl; - return Constant.mainPageUrl + "?type=in&basicUserId=" + id; + return Constant.mainPageUrl + "?type=in&UId=" + id; } public String getWeappScene() { if(id == null) return ""; - return "t:in:" + id; + return "t:in:UId:" + id; } @TableField(exist = false)