cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

yshop1.9.10,小程序新增商品海报与手机号绑定，海报生成拆分为H5端与小程序端等

Browse Source
This commit is contained in:
hupeng
2020-02-20 20:18:25 +08:00
parent 9017644082
commit c5b7b3f2fc
5 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java
View File

@ -292,7 +292,9 @@ public class StoreBargainController extends BaseController {
storeBargainUser.getPrice()).doubleValue(); storeBargainUser.getPrice()).doubleValue();
YxUserQueryVo userInfo = yxUserService.getYxUserById(uid); YxUserQueryVo userInfo = yxUserService.getYxUserById(uid);
String name = bargainId+"_"+uid + "_"+userInfo.getIsPromoter()+"_bargain_share_wap.jpg"; String userType = userInfo.getUserType();
if(!userType.equals("routine")) userType = "H5";
String name = bargainId+"_"+uid + "_"+userType+"_bargain_share_wap.jpg";
YxSystemAttachment attachment = systemAttachmentService.getInfo(name); YxSystemAttachment attachment = systemAttachmentService.getInfo(name);
String fileDir = path+"qrcode"+ File.separator; String fileDir = path+"qrcode"+ File.separator;
String qrcodeUrl = ""; String qrcodeUrl = "";
@ -300,7 +302,7 @@ public class StoreBargainController extends BaseController {
//生成二维码 //生成二维码
//判断用户是否小程序,注意小程序二维码生成路径要与H5不一样 不然会导致都跳转到小程序问题 //判断用户是否小程序,注意小程序二维码生成路径要与H5不一样 不然会导致都跳转到小程序问题
File file = FileUtil.mkdir(new File(fileDir)); File file = FileUtil.mkdir(new File(fileDir));
if(userInfo.getUserType().equals("routine")){ if(userType.equals("routine")){
siteUrl = siteUrl+"/bargain/"; siteUrl = siteUrl+"/bargain/";
QrCodeUtil.generate(siteUrl+"?bargainId="+bargainId+"&uid="+uid+"&spread="+uid, 180, 180, QrCodeUtil.generate(siteUrl+"?bargainId="+bargainId+"&uid="+uid+"&spread="+uid, 180, 180,
FileUtil.file(fileDir+name)); FileUtil.file(fileDir+name));
@ -318,7 +320,7 @@ public class StoreBargainController extends BaseController {
qrcodeUrl = attachment.getAttDir(); qrcodeUrl = attachment.getAttDir();
} }
String spreadPicName = bargainId+"_"+uid + "_"+userInfo.getIsPromoter()+"_bargain_user_spread.jpg"; String spreadPicName = bargainId+"_"+uid + "_"+userType+"_bargain_user_spread.jpg";
String spreadPicPath = fileDir+spreadPicName; String spreadPicPath = fileDir+spreadPicName;
YxSystemAttachment attachmentT = systemAttachmentService.getInfo(spreadPicName); YxSystemAttachment attachmentT = systemAttachmentService.getInfo(spreadPicName);

8
yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java
View File

@ -130,7 +130,9 @@ public class StoreCombinationController extends BaseController {
int uid = SecurityUtils.getUserId().intValue(); int uid = SecurityUtils.getUserId().intValue();
YxUserQueryVo userInfo = yxUserService.getYxUserById(uid); YxUserQueryVo userInfo = yxUserService.getYxUserById(uid);
String name = pinkId+"_"+uid + "_"+userInfo.getIsPromoter()+"_pink_share_wap.jpg"; String userType = userInfo.getUserType();
if(!userType.equals("routine")) userType = "H5";
String name = pinkId+"_"+uid + "_"+userType+"_pink_share_wap.jpg";
YxSystemAttachment attachment = systemAttachmentService.getInfo(name); YxSystemAttachment attachment = systemAttachmentService.getInfo(name);
String fileDir = path+"qrcode"+ File.separator; String fileDir = path+"qrcode"+ File.separator;
String qrcodeUrl = ""; String qrcodeUrl = "";
@ -138,7 +140,7 @@ public class StoreCombinationController extends BaseController {
//生成二维码 //生成二维码
//String fileDir = path+"qrcode"+File.separator; //String fileDir = path+"qrcode"+File.separator;
File file = FileUtil.mkdir(new File(fileDir)); File file = FileUtil.mkdir(new File(fileDir));
if(userInfo.getUserType().equals("routine")){ if(userType.equals("routine")){
siteUrl = siteUrl+"/pink/"; siteUrl = siteUrl+"/pink/";
QrCodeUtil.generate(siteUrl+"?pinkId="+pinkId+"&spread="+uid, 180, 180, QrCodeUtil.generate(siteUrl+"?pinkId="+pinkId+"&spread="+uid, 180, 180,
FileUtil.file(fileDir+name)); FileUtil.file(fileDir+name));
@ -156,7 +158,7 @@ public class StoreCombinationController extends BaseController {
qrcodeUrl = attachment.getAttDir(); qrcodeUrl = attachment.getAttDir();
} }
String spreadPicName = pinkId+"_"+uid + "_"+userInfo.getIsPromoter()+"_pink_user_spread.jpg"; String spreadPicName = pinkId+"_"+uid + "_"+userType+"_pink_user_spread.jpg";
String spreadPicPath = fileDir+spreadPicName; String spreadPicPath = fileDir+spreadPicName;
YxSystemAttachment attachmentT = systemAttachmentService.getInfo(spreadPicName); YxSystemAttachment attachmentT = systemAttachmentService.getInfo(spreadPicName);

27
yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java
View File

@ -137,14 +137,18 @@ public class StoreProductController extends BaseController {
} }
YxUserQueryVo userInfo = yxUserService.getYxUserById(uid); YxUserQueryVo userInfo = yxUserService.getYxUserById(uid);
String name = id+"_"+uid + "_"+userInfo.getIsPromoter()+"_product_detail_wap.jpg"; String userType = userInfo.getUserType();
if(!userType.equals("routine")) userType = "H5";
String name = id+"_"+uid + "_"+userType+"_product_detail_wap.jpg";
YxSystemAttachment attachment = systemAttachmentService.getInfo(name); YxSystemAttachment attachment = systemAttachmentService.getInfo(name);
String fileDir = path+"qrcode"+ File.separator; String fileDir = path+"qrcode"+ File.separator;
String qrcodeUrl = ""; String qrcodeUrl = "";
String routineQrcodeUrl = "";
if(ObjectUtil.isNull(attachment)){ if(ObjectUtil.isNull(attachment)){
//生成二维码 //生成二维码
File file = FileUtil.mkdir(new File(fileDir)); File file = FileUtil.mkdir(new File(fileDir));
if(userInfo.getUserType().equals("routine")){ if(userType.equals("routine")){
//下载图片
siteUrl = siteUrl+"/product/"; siteUrl = siteUrl+"/product/";
QrCodeUtil.generate(siteUrl+"?productId="+id+"&spread="+uid, 180, 180, QrCodeUtil.generate(siteUrl+"?productId="+id+"&spread="+uid, 180, 180,
FileUtil.file(fileDir+name)); FileUtil.file(fileDir+name));
@ -158,17 +162,26 @@ public class StoreProductController extends BaseController {
fileDir+name,"qrcode/"+name); fileDir+name,"qrcode/"+name);
qrcodeUrl = fileDir+name; qrcodeUrl = fileDir+name;
routineQrcodeUrl = apiUrl + "/api/file/qrcode/"+name;
}else{ }else{
qrcodeUrl = attachment.getAttDir(); qrcodeUrl = attachment.getAttDir();
routineQrcodeUrl = apiUrl + "/api/file/" + attachment.getSattDir();
} }
try { if(userType.equals("routine")){
String base64CodeImg = co.yixiang.utils.FileUtil.fileToBase64(new File(qrcodeUrl)); productDTO.getStoreInfo().setCodeBase(routineQrcodeUrl);
productDTO.getStoreInfo().setCodeBase("data:image/jpeg;base64," + base64CodeImg); }else{
} catch (Exception e) { try {
e.printStackTrace(); String base64CodeImg = co.yixiang.utils.FileUtil.fileToBase64(new File(qrcodeUrl));
productDTO.getStoreInfo().setCodeBase("data:image/jpeg;base64," + base64CodeImg);
} catch (Exception e) {
e.printStackTrace();
}
} }
return ApiResult.ok(productDTO); return ApiResult.ok(productDTO);
} }

10
yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java
View File

@ -133,7 +133,11 @@ public class UserBillController extends BaseController {
if(StrUtil.isEmpty(siteUrl)){ if(StrUtil.isEmpty(siteUrl)){
return ApiResult.fail("未配置api地址"); return ApiResult.fail("未配置api地址");
} }
String name = uid + "_"+userInfo.getIsPromoter()+"_user_wap.jpg";
String userType = userInfo.getUserType();
if(!userType.equals("routine")) userType = "H5";
String name = uid + "_"+userType+"_user_wap.jpg";
YxSystemAttachment attachment = systemAttachmentService.getInfo(name); YxSystemAttachment attachment = systemAttachmentService.getInfo(name);
String fileDir = path+"qrcode"+File.separator; String fileDir = path+"qrcode"+File.separator;
@ -141,7 +145,7 @@ public class UserBillController extends BaseController {
if(ObjectUtil.isNull(attachment)){ if(ObjectUtil.isNull(attachment)){
//生成二维码 //生成二维码
//判断用户是否小程序,注意小程序二维码生成路径要与H5不一样 不然会导致都跳转到小程序问题 //判断用户是否小程序,注意小程序二维码生成路径要与H5不一样 不然会导致都跳转到小程序问题
if(userInfo.getUserType().equals("routine")){ if(userType.equals("routine")){
siteUrl = siteUrl+"/distribution/"; siteUrl = siteUrl+"/distribution/";
} }
File file = FileUtil.mkdir(new File(fileDir)); File file = FileUtil.mkdir(new File(fileDir));
@ -157,7 +161,7 @@ public class UserBillController extends BaseController {
} }
String spreadPicName = uid + "_"+userInfo.getIsPromoter()+"_user_spread.jpg"; String spreadPicName = uid + "_"+userType+"_user_spread.jpg";
String spreadPicPath = fileDir+spreadPicName; String spreadPicPath = fileDir+spreadPicName;
YxSystemAttachment attachmentT = systemAttachmentService.getInfo(spreadPicName); YxSystemAttachment attachmentT = systemAttachmentService.getInfo(spreadPicName);

15
yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WxMaUserController.java
View File

@ -45,6 +45,9 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.LinkedHashMap;
import java.util.Map;
/** /**
* @author hupeng * @author hupeng
* @date 2020/02/07 * @date 2020/02/07
@ -113,6 +116,7 @@ public class WxMaUserController {
wxMaConfig.setAppid(appId); wxMaConfig.setAppid(appId);
wxMaConfig.setSecret(secret); wxMaConfig.setSecret(secret);
wxMaService.setWxMaConfig(wxMaConfig); wxMaService.setWxMaConfig(wxMaConfig);
String phone = "";
try { try {
WxMaJscode2SessionResult session = wxMaService.getUserService() WxMaJscode2SessionResult session = wxMaService.getUserService()
.getSessionInfo(param.getCode()); .getSessionInfo(param.getCode());
@ -121,16 +125,19 @@ public class WxMaUserController {
WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService() WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService()
.getPhoneNoInfo(session.getSessionKey(), param.getEncryptedData(), param.getIv()); .getPhoneNoInfo(session.getSessionKey(), param.getEncryptedData(), param.getIv());
phone = phoneNoInfo.getPhoneNumber();
YxUser yxUser = new YxUser(); YxUser yxUser = new YxUser();
yxUser.setPhone(phoneNoInfo.getPhoneNumber()); yxUser.setPhone(phone);
yxUser.setUid(uid); yxUser.setUid(uid);
userService.updateById(yxUser); userService.updateById(yxUser);
} catch (WxErrorException e) { } catch (WxErrorException e) {
e.printStackTrace(); return ApiResult.fail(e.getMessage());
//e.printStackTrace();
} }
Map<String,Object> map = new LinkedHashMap<>();
map.put("phone",phone);
return ApiResult.ok(map,"绑定成功");
return ApiResult.ok("绑定成功");
} }