czg_team
/
cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加会员变动与通知

This commit is contained in:
牛叉闪闪 2024-08-28 17:18:41 +08:00
parent e49e72e088
commit f01391014a
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/chaozhanggui/system/cashierservice/rabbit/BalanceConsumer.java
View File

@ -38,9 +38,9 @@ public class BalanceConsumer {
@Value("${wx.balance.appId}")
private static String appId ;
private static String appId="wxd88fffa983758a30" ;
@Value("${wx.balance.secrete}")
private static String secrete ;
private static String secrete="a34a61adc0602118b49400baa8812454" ;
@Value("${wx.balance.warnMsgTmpId}")
private static String msgTmpId = "AV-KybUHaK3KtFVLqpy6PHccHBS7XeX__mOM4RbufnQ";
@ -84,7 +84,7 @@ public class BalanceConsumer {
public static JSONObject sendTemplateMsg(String templateId, String toUserOpenId,String shopName,BigDecimal amount,BigDecimal balance,String type,String date ) {
public static JSONObject sendTemplateMsg(String templateId, String toUserOpenId,String shopName,String amount,String balance,String type,String date ) {
log.info("开始发送微信模板消息， 接收用户openId: {},templateId:{},shopName:{},amount:{},balance:{},type:{},date:{}", toUserOpenId,templateId, shopName,amount,balance,type,date);
String accessToken = getAccessToken();
@ -151,7 +151,7 @@ public class BalanceConsumer {
String toUserOpenId=userInfo.getMiniAppOpenId();
try {
JSONObject resObj=sendTemplateMsg(msgTmpId, toUserOpenId, shopInfo.getShopName(),amount,balance,type,convertDate(time));
JSONObject resObj=sendTemplateMsg(msgTmpId, toUserOpenId, shopInfo.getShopName(),amount.toPlainString(),balance.toPlainString(),type,convertDate(time));
log.info("会员变动消息发送返回:{}",resObj.toString());
}catch (Exception e) {
log.error("发送失败, openId:{}, msg: {}", toUserOpenId, e.getMessage());
@ -174,6 +174,6 @@ public class BalanceConsumer {
public static void main(String[] args) {
//
sendTemplateMsg("AV-KybUHaK3KtFVLqpy6PHccHBS7XeX__mOM4RbufnQ","or1l862a5N_W6eoL1-sJeewpOjZw","测试店铺",new BigDecimal(0.01),new BigDecimal(6.21),"充值",convertDate(new Date()));
sendTemplateMsg("AV-KybUHaK3KtFVLqpy6PHccHBS7XeX__mOM4RbufnQ","or1l862a5N_W6eoL1-sJeewpOjZw","测试店铺",new BigDecimal(0.01).toPlainString(),new BigDecimal(6.21).toPlainString(),"充值",convertDate(new Date()));
}
}

12
src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
View File

@ -357,7 +357,7 @@ public class MemberService {
flow.setCreateTime(new Date());
tbShopUserFlowMapper.insert(flow);
BigDecimal fl=null;
TbActivate activate = tbActivateMapper.selectByAmount(shopInfo.getId().toString(), memberIn.getAmount());
if (ObjectUtil.isNotEmpty(activate) && ObjectUtil.isNotNull(activate)) {
BigDecimal awardAmount = BigDecimal.ZERO;
@ -383,6 +383,7 @@ public class MemberService {
flow.setBalance(shopUser.getAmount());
flow.setCreateTime(new Date());
tbShopUserFlowMapper.insert(flow);
fl=awardAmount;
}
JSONObject jsonObject = new JSONObject();
@ -396,7 +397,7 @@ public class MemberService {
JSONObject baObj=new JSONObject();
baObj.put("userId",shopUser.getUserId());
baObj.put("shopId",shopInfo.getId());
baObj.put("amount",amount);
baObj.put("amount",ObjectUtil.isNull(fl)?amount:amount.add(fl));
baObj.put("balance",shopUser.getAmount());
baObj.put("type","扫码充值");
baObj.put("time",flow.getCreateTime());
@ -549,7 +550,7 @@ public class MemberService {
JSONObject baObj=new JSONObject();
baObj.put("userId",shopUser.getUserId());
baObj.put("shopId",shopUser.getShopId());
baObj.put("amount",memberIn.getAmount());
baObj.put("amount",memberIn.getAmount().add(awardAmount));
baObj.put("balance",shopUser.getAmount());
baObj.put("type","充值");
baObj.put("time",flow.getCreateTime());
@ -656,6 +657,7 @@ public class MemberService {
flow.setBalance(shopUser.getAmount());
flow.setCreateTime(new Date());
tbShopUserFlowMapper.insert(flow);
BigDecimal fl=null;
TbActivate activate = tbActivateMapper.selectByAmount(shopInfo.getId().toString(), memberIn.getAmount());
if (ObjectUtil.isNotEmpty(activate) && ObjectUtil.isNotNull(activate)) {
@ -683,6 +685,8 @@ public class MemberService {
flow.setCreateTime(new Date());
tbShopUserFlowMapper.insert(flow);
fl=awardAmount;
}
@ -698,7 +702,7 @@ public class MemberService {
JSONObject baObj=new JSONObject();
baObj.put("userId",shopUser.getUserId());
baObj.put("shopId",shopInfo.getId());
baObj.put("amount",amount);
baObj.put("amount",ObjectUtil.isNull(fl)?amount:amount.add(fl));
baObj.put("balance",shopUser.getAmount());
baObj.put("type","充值");
baObj.put("time",flow.getCreateTime());