blame | history | patch | commit | commitdiff | ignore whitespace
KKSU
2024-01-17 ec4e65ba157bded805081aa40977b1d996fd2b21 
 src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java


@@ -12,37 +12,32 @@


import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;


import cc.mrbird.febs.mall.service.IMallMoneyFlowService;


import cc.mrbird.febs.pay.model.NotifyData;


import cc.mrbird.febs.pay.model.OrderStateDto;


import cc.mrbird.febs.pay.model.OrderStateMsgVo;


import cc.mrbird.febs.pay.model.WxTemplateData;


import cc.mrbird.febs.pay.service.IPayService;


import cc.mrbird.febs.pay.service.IXcxPayService;


import cc.mrbird.febs.pay.util.PayThreadPool;


import cc.mrbird.febs.pay.service.WxFaPiaoService;


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;


import cn.hutool.json.JSONUtil;


import io.swagger.annotations.ApiOperation;


import com.wechat.pay.contrib.apache.httpclient.notification.NotificationRequest;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.http.ResponseEntity;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.client.RestTemplate;


import org.thymeleaf.engine.TemplateData;




import javax.servlet.ServletOutputStream;


import javax.servlet.http.HttpServletRequest;


import javax.servlet.http.HttpServletResponse;


import java.io.BufferedReader;


import java.io.IOException;


import java.math.BigDecimal;


import java.math.RoundingMode;


import java.nio.charset.StandardCharsets;


import java.util.Date;


import java.util.HashMap;


import java.util.Map;


@@ -72,9 +67,14 @@


    private IApiMallMemberService mallMemberService;


    @Autowired


    private MallAgentRecordMapper mallAgentRecordMapper;


    @Autowired


    private AgentProducer agentProducer;




    @Autowired


    private IXcxPayService iXcxPayService;




    @Autowired


    private WxFaPiaoService wxFaPiaoService;




    private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);


    /**


@@ -139,6 +139,7 @@


                            log.debug("检查支付金额payMoney={},mallMoneyFlow.getPayMoney()={}", payMoney, mallMoneyFlow.getAmount());


                            //合伙人申请的充值，要更新会员状态为FIRST_LEVEL


                            if(2 == type){


                                log.info("微信充值回调" + agentApplyId);


                                MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(agentApplyId);


                                mallMemberService.updateMemberAgent(agentApplyId,mallAgentRecord.getAgentLevel());


                            }


@@ -243,6 +244,17 @@


//        System.out.println(rechargeNo);


//    }


    /**


     * 微信电子发票回调接口


     * @return


     */


    @Transactional(rollbackFor = Exception.class)


    @RequestMapping(value = "/fapiaoCallBack")


    public Map<String, Object> fapiaoCallBack(HttpServletResponse response, HttpServletRequest request) throws IOException {


        return wxFaPiaoService.fapiaoCallBack(response,request);




    }




    /**


     * 微信支付回调接口


     */


    @Transactional(rollbackFor = Exception.class)


@@ -305,6 +317,8 @@


                            order.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());


                            mallOrderInfoMapper.updateById(order);




                            agentProducer.sendOrderCoupon(order.getId());




                            mallMoneyFlowService.addMoneyFlow(


                                    order.getMemberId(),


                                    order.getAmount().negate(),