czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

创客额度相关,分享改bug，

Browse Source
This commit is contained in:
liuyingfang
2023-08-21 18:22:12 +08:00
parent cd190ba1f5
commit b108849572
27 changed files with 571 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pluss-wap-page/src/main/java/cn/pluss/platform/controller/component/PayCallbackConsumer.java
View File

@@ -1,5 +1,6 @@
package cn.pluss.platform.controller.component;
import cn.pluss.platform.UserMakerQuota.UserMakerQuotaService;
import cn.pluss.platform.entity.MerchantOrder;
import cn.pluss.platform.merchantOrder.MerchantOrderService;
import cn.pluss.platform.merchantProfit.MerchantProfitService;
@@ -30,6 +31,9 @@ public class PayCallbackConsumer {
@Resource
private RealFansService realFansService;
@Resource
private UserMakerQuotaService userMakerQuotaService;
@RabbitHandler
public void process(String msg) {
log.info("接受到的消息内容为:{}", msg);
@@ -42,6 +46,8 @@ public class PayCallbackConsumer {
// realFansService.createFansProfit(order);
}
merchantProfitService.createOrderProfitV2(order,"1");
//判断是否创客增加额度
userMakerQuotaService.quotaInfo(order);
MerchantOrder update = new MerchantOrder();
update.setId(order.getId());
update.setProfitShareMoney(order.getProfitShareMoney());

19
pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java
View File

@@ -2491,7 +2491,7 @@ public class MerchantController {
}else {
inviteNum=params[0].split("=")[1];
result.put("typeCode",params[1].split("=")[1]);
result.put("currentFee",(params[1].split("=").length<=1)?"":params[1].split("=")[1]);
result.put("currentFee",(params[2].split("=").length<=1)?"":params[2].split("=")[1]);
}
String phone = "";
String userName = "";
@@ -2595,7 +2595,7 @@ public class MerchantController {
userInfo.setCreateTime(new Date());
userInfo.setTypeCode(typeCode == null? userInfo.getTypeCode(): typeCode);
userInfo.setCurrentFee(currentFee== null? userInfo.getCurrentFee(): currentFee);
userInfoService.saveUserInfo(userInfo);
UserApp userApp = new UserApp();
userApp.setUserId(userInfo.getId());
@@ -2649,12 +2649,21 @@ public class MerchantController {
promotion.setIsExtend(promotion.getTypeCode().equals("MC")?"0":"1");
promotion.setCreateTime(new Date());
userPromotionMapper.insert(promotion);
// 可能和数据库存储的数据不一致
userInfo.setCreateTime(null);
userAppService.save(userApp);
ipRecordService.saveRegIp(userInfo.getId() + "", userInfo.getId() + "");
userInfoService.goregister(userInfo,userApp,promotion);
PhoneValidateCode phoneValidate = new PhoneValidateCode();
if (StringUtil.isNotEmpty(phone)) {
phoneValidate.setPhone(phone);