优惠卷

xiaoyong931011

2023-09-11 71d234f757e752a5157eda0cfade6ad100d18d07

 src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java

@@ -21,6 +21,7 @@
import cc.mrbird.febs.pay.util.Signature;
import cc.mrbird.febs.pay.util.Util;
import cc.mrbird.febs.pay.util.WechatConfigure;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONObject;
@@ -72,6 +73,8 @@
    private IApiMallMemberService mallMemberService;
    @Autowired
    private MallAgentRecordMapper mallAgentRecordMapper;
    @Autowired
    private AgentProducer agentProducer;

    @Autowired
    private IXcxPayService iXcxPayService;
@@ -139,8 +142,9 @@
                            log.debug("检查支付金额payMoney={},mallMoneyFlow.getPayMoney()={}", payMoney, mallMoneyFlow.getAmount());
                            //合伙人申请的充值，要更新会员状态为FIRST_LEVEL
                            if(2 == type){
                                log.info("微信充值回调" + agentApplyId);
                                MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(agentApplyId);
                                mallMemberService.updateMemberAgent(memberId,mallAgentRecord.getAgentLevel());
                                mallMemberService.updateMemberAgent(agentApplyId,mallAgentRecord.getAgentLevel());
                            }
                            memberWalletService.addBalance(payMoney,memberId);
                            mallMoneyFlow.setStatus(2);
@@ -305,6 +309,8 @@
                            order.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());
                            mallOrderInfoMapper.updateById(order);

                            agentProducer.sendOrderCoupon(order.getId());

                            mallMoneyFlowService.addMoneyFlow(
                                    order.getMemberId(),
                                    order.getAmount().negate(),