From 0e251ceb84d93f831e5b1c7bd8587b846e2ee17d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 25 Aug 2022 15:19:05 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java | 3
src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java | 129 +++++++++++++++++++++++++++++++++++++------
2 files changed, 113 insertions(+), 19 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java b/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
index 4760866..f37d47f 100644
--- a/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
+++ b/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
@@ -22,8 +22,9 @@
registration.excludePathPatterns("/api/category/**");
registration.excludePathPatterns("/api/goods/**");
registration.excludePathPatterns("/api/pay/**");
- registration.excludePathPatterns("/api/unipay/**");
registration.excludePathPatterns("/api/news/**");
registration.excludePathPatterns("/api/member/cashOutSetting");
+ registration.excludePathPatterns("/api/unipay/unipayCallBack");
+ registration.excludePathPatterns("/api/unipay/agreeMentPayCallBack");
}
}
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
index 43cb888..2a7eada 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
@@ -1,9 +1,11 @@
package cc.mrbird.febs.pay.controller;
+import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
+import cc.mrbird.febs.mall.dto.RegisterAppealDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.MallGoodsMapper;
import cc.mrbird.febs.mall.mapper.MallGoodsSkuMapper;
@@ -13,24 +15,31 @@
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IMallAchieveService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
+import cc.mrbird.febs.pay.model.AgreeMentPayCallBackDto;
+import cc.mrbird.febs.pay.model.AgreeMentPaySmsDto;
import cc.mrbird.febs.pay.model.UniPayCallBackDto;
+import cc.mrbird.febs.pay.service.UnipayService;
+import cc.mrbird.febs.pay.util.JsonUtil;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-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.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
-
+/**
+ * 平台公钥:MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwSAEXsiC0IYha6a94imKq8VfOkk7WjDRAQWMBRnoKOZeEUeMrHYiblcrqeMYXGpV13288iUOkuyKwkPXkYXyIQK8emvJIbQOhtB5bSlAbodsPgncM9Ney1GFiz+7ogBxyt58mP8AA9UHtMw7u78zZoQ1+dUWwUUowVXml3Q0cVQIDAQAB
+ */
@Slf4j
@RestController
@RequestMapping(value = "/api/unipay")
@@ -56,16 +65,18 @@
private IMallMoneyFlowService mallMoneyFlowService;
@Autowired
private MallMemberMapper memberMapper;
+ @Autowired
+ private UnipayService unipayService;
@GetMapping(value = "/unipayCallBack")
public String unipayCallBack(HttpServletRequest request, UniPayCallBackDto uniPayCallBackDto){
- log.info("进入汇聚支付回调"+ JSONUtil.parseObj(uniPayCallBackDto));
+ log.info("进入汇聚支付聚合支付回调"+ JSONUtil.parseObj(uniPayCallBackDto));
String orderNo = uniPayCallBackDto.getR2_OrderNo();
BigDecimal orderAmount = new BigDecimal(uniPayCallBackDto.getR3_Amount());
String callBackState = uniPayCallBackDto.getR6_Status();
String payTradeNo = uniPayCallBackDto.getR7_TrxNo();
- log.info("进入汇聚支付回调"+orderNo+";"+orderAmount+";"+payTradeNo+";"+callBackState);
+ log.info("进入汇聚支付聚合支付回调"+orderNo+";"+orderAmount+";"+payTradeNo+";"+callBackState);
if("100".equals(callBackState) && StrUtil.isNotBlank(orderNo)){
MallOrderInfo orderInfo = orderInfoMapper.selectByOrderNo(orderNo);
if(ObjectUtil.isNotEmpty(orderInfo)){
@@ -122,21 +133,103 @@
return "success";
}
- public static void main(String[] args) {
- String output = "https://www.baidu.com?r1_MerchantNo=888000000000000&r2_OrderNo=2020100000000000000&r3_Amount=10.00&r4_Cur=1&r5_Mp=goods&r6_Status=100&r7_TrxNo=100220100000000000&r8_BankOrderNo=100220100000000000&r9_BankTrxNo=4200000000202000000000000000&ra_PayTime=2022-08-11%2B16%253A14%253A39&rb_DealTime=2022-08-11%2B16%253A14%253A39&rc_BankCode=WEIXI_GZH&hmac=14c3819b5cc7bb80635901934f76c7a4";
- String params = StrUtil.subAfter(output, "?", true);
- System.out.println(params);
- List<String> paramStrList = StrUtil.splitTrim(params, "&");
- String orderNo = "";
- if(CollUtil.isNotEmpty(paramStrList)){
- for(String paramStr :paramStrList){
- boolean r2_orderNo = paramStr.startsWith("r2_OrderNo");
- if(r2_orderNo){
- orderNo = StrUtil.subAfter(paramStr, "=", true);
+// public static void main(String[] args) {
+// String output = "https://www.baidu.com?r1_MerchantNo=888000000000000&r2_OrderNo=2020100000000000000&r3_Amount=10.00&r4_Cur=1&r5_Mp=goods&r6_Status=100&r7_TrxNo=100220100000000000&r8_BankOrderNo=100220100000000000&r9_BankTrxNo=4200000000202000000000000000&ra_PayTime=2022-08-11%2B16%253A14%253A39&rb_DealTime=2022-08-11%2B16%253A14%253A39&rc_BankCode=WEIXI_GZH&hmac=14c3819b5cc7bb80635901934f76c7a4";
+// String params = StrUtil.subAfter(output, "?", true);
+// System.out.println(params);
+// List<String> paramStrList = StrUtil.splitTrim(params, "&");
+// String orderNo = "";
+// if(CollUtil.isNotEmpty(paramStrList)){
+// for(String paramStr :paramStrList){
+// boolean r2_orderNo = paramStr.startsWith("r2_OrderNo");
+// if(r2_orderNo){
+// orderNo = StrUtil.subAfter(paramStr, "=", true);
+// }
+// }
+// }
+// System.out.println(orderNo);
+// }
+
+ @ApiOperation(value = "获取协议支付签约短信", notes = "获取协议支付签约短信")
+ @PostMapping(value = "getAgreeMentPaySms")
+ public FebsResponse getAgreeMentPaySms(@RequestBody AgreeMentPaySmsDto agreeMentPaySmsDto) {
+ unipayService.getAgreeMentPaySms(agreeMentPaySmsDto);
+ return new FebsResponse().success().message("申请成功");
+ }
+
+// public static void main(String[] args) {
+// String data = "{\\\"bank_trx_no\\\":\\\"0825144603229910\\\",\\\"jp_order_no\\\":\\\"100120220825446322447537651712\\\",\\\"mch_order_no\\\":\\\"2022082514435329133\\\",\\\"order_amount\\\":0.10,\\\"order_desc\\\":\\\"测试\\\",\\\"order_status\\\":\\\"P1000\\\",\\\"pay_success_time\\\":\\\"2022-08-25 14:46:04\\\"}";
+// JSONObject jsonObject = JSONUtil.parseObj(data);
+// String orderNo = jsonObject.get("mch_order_no").toString();
+// String pay_success_time = jsonObject.get("pay_success_time").toString();
+// System.out.println(orderNo +"222"+pay_success_time);
+// }
+
+ @PostMapping(value = "/agreeMentPayCallBack")
+ public String agreeMentPayCallBack(@RequestBody AgreeMentPayCallBackDto agreeMentPayCallBackDto){
+ log.info("进入汇聚支付协议支付回调"+ JSONUtil.parseObj(agreeMentPayCallBackDto));
+ String data = agreeMentPayCallBackDto.getData();
+ JSONObject jsonObject = JSONUtil.parseObj(data);
+ String orderNo = jsonObject.get("mch_order_no").toString();
+ String pay_success_time = jsonObject.get("pay_success_time").toString();
+ String jp_order_no = jsonObject.get("jp_order_no").toString();
+ String biz_code = agreeMentPayCallBackDto.getBiz_code();
+
+ log.info("进入汇聚支付协议支付回调"+orderNo+";"+pay_success_time+";"+biz_code+";"+jp_order_no);
+ if("JS000000".equals(biz_code) && StrUtil.isNotBlank(orderNo)){
+ MallOrderInfo orderInfo = orderInfoMapper.selectByOrderNo(orderNo);
+ if(ObjectUtil.isNotEmpty(orderInfo)){
+ Integer status = orderInfo.getStatus();
+ if(OrderStatusEnum.WAIT_PAY.getValue() == status){
+
+ orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+ orderInfo.setPayResult("1");
+ orderInfo.setPayTime(DateUtil.parse(pay_success_time));
+ orderInfo.setPayTradeNo(jp_order_no);
+ orderInfoMapper.updateById(orderInfo);
+
+ boolean hasTc = false;
+ // 静态倍数
+ List<MallOrderItem> orderItems = mallOrderInfoMapper.getMallOrderItemByOrderId(orderInfo.getId());
+ if (CollUtil.isNotEmpty(orderItems)) {
+ for (MallOrderItem orderItem : orderItems) {
+ MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId());
+ BigDecimal score = BigDecimal.ZERO;
+ MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
+ if (mallGoods.getIsNormal() == 2) {
+ hasTc = true;
+ score = sku.getPresentPrice().multiply(mallGoods.getStaticMulti()).multiply(new BigDecimal(orderItem.getCnt()));
+ // 普通商品也及时结算，不再10天结算
+ } else {
+ score = sku.getPresentPrice();
+ }
+
+ if (score.compareTo(BigDecimal.ZERO) > 0) {
+ memberWalletService.add(score, orderInfo.getMemberId(), "score");
+ mallMoneyFlowService.addMoneyFlow(orderInfo.getMemberId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+
+ // 添加业绩
+ mallAchieveService.add(orderItem.getId());
+ }
+ }
+ }
+
+ // 购买套餐后，升级为普通会员
+ MallMember mallMember = memberMapper.selectById(orderInfo.getMemberId());
+ if (hasTc) {
+ if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) {
+ mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
+ memberMapper.updateById(mallMember);
+ }
+ }
+
+ mallMoneyFlowService.addMoneyFlow(mallMember.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
+ agentProducer.sendAutoLevelUpMsg(mallMember.getId());
+ agentProducer.sendOrderReturn(orderInfo.getId());
}
}
}
- System.out.println(orderNo);
+ return "success";
}
}
--
Gitblit v1.9.1