From 58e344a0c14692fce547d64ea9295f866754fe63 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 03 四月 2025 18:19:26 +0800
Subject: [PATCH] 1
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index 3092149..1eb56f6 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -35,6 +35,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -93,6 +94,7 @@
+
/**
* 通过运营商id查询运营商对应的支付宝商户号
*/
@@ -104,17 +106,17 @@
/**
* 通过运营商id查询运营商对应的微信商户号
*/
- @RequestMapping("/base/getmerchantNumberByOperatorId")
+ @RequestMapping("/base/getmerchantNumberByOperatorId/{id}")
@ResponseBody
- public String getmerchantNumberByOperatorId(Integer id) {
+ public String getmerchantNumberByOperatorId(@PathVariable("id")Integer id) {
return siteService.getmerchantNumberByOperatorId(id);
}
/**
* 根据运营商id获取对应运营商分账比例 返回格式: 微信分账比例,支付宝分账比例
*/
- @RequestMapping("/base/getProportionByOperatorId")
+ @RequestMapping("/base/getProportionByOperatorId/{id}")
@ResponseBody
- public String getProportionByOperatorId(Integer id) {
+ public String getProportionByOperatorId(@PathVariable("id")Integer id) {
OperatorUser operatorId = operatorUserService.getOne(
new QueryWrapper<OperatorUser>().eq("operatorId",id)
);
@@ -124,6 +126,7 @@
if (operatorId.getAlipayProportion() == null){
operatorId.setAlipayProportion("0");
}
+ System.err.println("查询分账比例"+operatorId);
return operatorId.getWechatProportion()+","+operatorId.getAlipayProportion();
}
/**
@@ -350,6 +353,7 @@
@PostMapping("/base/site/weChatPaymentSiteCallback")
public void weChatPaymentSiteCallback(HttpServletRequest request, HttpServletResponse response) {
try {
+ System.err.println("预约场地回调");
Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
if (null != map) {
String code = map.get("out_trade_no");
@@ -361,12 +365,49 @@
siteBooking.setStatus(1);
siteBooking.setPayOrderNo(transaction_id);
siteBookingService.updateById(siteBooking);
-
+ Store byId = service.getById(siteBooking.getStoreId());
+ if (byId.getOperatorId()!=null && byId.getOperatorId()!=0){
+ System.err.println("预约场地分账");
+ // 休眠两分钟后再调用分账接口 避免提示订单正在处理中
+ Thread.sleep(120000);
+ // 根据运营商id获取对应运营商分账比例 返回格式: 微信分账比例,支付宝分账比例
+ OperatorUser operatorId = operatorUserService.getOne(
+ new QueryWrapper<OperatorUser>().eq("operatorId",byId.getOperatorId())
+ );
+ if (operatorId.getWechatProportion() == null){
+ operatorId.setWechatProportion("0");
+ }
+ if (operatorId.getAlipayProportion() == null){
+ operatorId.setAlipayProportion("0");
+ }
+ String proportion= operatorId.getWechatProportion()+","+operatorId.getAlipayProportion();
+ String[] split = proportion.split(",");
+ String s1 = split[0];
+ if (!s1.equals("未设置")){
+ BigDecimal bigDecimal = new BigDecimal(s1);
+ // 分账比例
+ BigDecimal bigDecimal1 = bigDecimal.divide(new BigDecimal(100)).setScale(2);
+ // 微信商户号
+ String s2 =siteService.getmerchantNumberByOperatorId(byId.getOperatorId());
+ String nonce_str = UUIDUtil.getRandomCode(16);
+ BigDecimal bigDecimal2 = new BigDecimal(siteBooking.getPayMoney());
+ ResultUtil fenzhang = payMoneyUtil.fenzhang(transaction_id, bigDecimal2.multiply(bigDecimal1), s2,nonce_str,"预约场地分账");
+ if (!fenzhang.getCode().equals(200)){
+ System.err.println("分账失败 原因是:"+fenzhang.getMsg());
+ }else{
+ siteBooking.setFenzhangNo(fenzhang.getData().toString());
+ siteBooking.setFenzhangOrderNo(nonce_str);
+ siteBooking.setFenzhangAmount(bigDecimal2.multiply(bigDecimal1));
+ siteBookingService.updateById(siteBooking);
+ }
+ }
+ }
PrintWriter out = response.getWriter();
out.write(result);
out.flush();
out.close();
}
+
}
} catch (Exception e) {
e.printStackTrace();
@@ -506,12 +547,15 @@
public ResultUtil<Map<String, Object>> queryMySiteById(Integer id) {
try {
HashMap<String, Object> map = new HashMap<>();
+ System.err.println("预约id"+id);
SiteBooking siteBooking = siteBookingService.getById(id);
+ System.err.println("预约"+siteBooking);
Integer storeId = siteBooking.getStoreId();
Store byId1 = service.getById(storeId);
Site site = siteService.getById(siteBooking.getSiteId());
map.put("siteName", byId1.getName());
SiteType siteType = siteTypeService.getById(site.getSiteTypeId());
+ System.err.println("预约类型"+siteType);
map.put("siteType", siteType.getName());
map.put("shopName", byId1.getName());
map.put("shopAddress", byId1.getAddress());
@@ -541,7 +585,9 @@
BeanUtils.copyProperties(siteBooking, siteBookingVo);
siteBookingVo.setStartTime(siteBooking.getStartTime().getTime());
siteBookingVo.setEndTime(siteBooking.getEndTime().getTime());
- siteBookingVo.setPayTime(siteBooking.getPayTime().getTime());
+ if (siteBooking.getPayTime()!=null){
+ siteBookingVo.setPayTime(siteBooking.getPayTime().getTime());
+ }
map.put("data", siteBookingVo);
map.put("ids", ids);
return ResultUtil.success(map);
--
Gitblit v1.7.1