|
|
|
@@ -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<String, String> map = (Map) resultData.data; |
|
|
|
if(map!=null && map.get("url") !=null) { |
|
|
|
String url = map.get("url"); |
|
|
|
|