xhxu 5 лет назад
Родитель
Сommit
809e377b48
2 измененных файлов: 8 добавлений и 8 удалений
  1. +6
    -6
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java

+ 6
- 6
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Просмотреть файл

@@ -167,8 +167,8 @@ public class WxUserGrantController extends BaseController {
String systemInfo = map.get("systemInfo"); String systemInfo = map.get("systemInfo");


try { 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)){ if(StringUtils.isNotBlank(basicUserId)){
wxCUserFrom.setFromType(EnumCUserFrom.FROM_C_USER_BASIC_INFO.getCode()); wxCUserFrom.setFromType(EnumCUserFrom.FROM_C_USER_BASIC_INFO.getCode());
wxCUserFrom.setFromId(Long.parseLong(basicUserId)); wxCUserFrom.setFromId(Long.parseLong(basicUserId));
@@ -995,10 +995,10 @@ public class WxUserGrantController extends BaseController {
if(StringUtils.isNotBlank(wxCUserBasicInfo.getQrCode())){ if(StringUtils.isNotBlank(wxCUserBasicInfo.getQrCode())){
qrCode = wxCUserBasicInfo.getQrCode(); qrCode = wxCUserBasicInfo.getQrCode();
}else{ }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; Map<String, String> map = (Map) resultData.data;
if(map!=null && map.get("url") !=null) { if(map!=null && map.get("url") !=null) {
String url = map.get("url"); String url = map.get("url");


+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java Просмотреть файл

@@ -139,13 +139,13 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId {
public String getWeappPath() { public String getWeappPath() {
if(id == null) if(id == null)
return Constant.mainPageUrl; return Constant.mainPageUrl;
return Constant.mainPageUrl + "?type=in&basicUserId=" + id;
return Constant.mainPageUrl + "?type=in&UId=" + id;
} }


public String getWeappScene() { public String getWeappScene() {
if(id == null) if(id == null)
return ""; return "";
return "t:in:" + id;
return "t:in:UId:" + id;
} }


@TableField(exist = false) @TableField(exist = false)


Загрузка…
Отмена
Сохранить