From 969759b44baf414778aa68f1f3af5cd79d9f7e9b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 01 Aug 2022 10:58:08 +0800
Subject: [PATCH] 20220727 保存代码
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 9 ++++++++-
src/main/resources/application-dev.yml | 4 ++--
src/main/resources/application-prod.yml | 4 ++--
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 2 +-
src/main/resources/application-test.yml | 2 +-
src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java | 1 +
6 files changed, 15 insertions(+), 7 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 12a9e75..1222345 100644
--- a/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
+++ b/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
@@ -26,5 +26,6 @@
registration.excludePathPatterns("/api/member/cashOutSetting");
registration.excludePathPatterns("/api/leader/leaderList");
registration.excludePathPatterns("/api/leader/leaderTitle");
+ registration.excludePathPatterns("/api/xcxPay/wxpayCallback");
}
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 62c8152..1761ef5 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -22,6 +22,7 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -66,7 +67,10 @@
@Transactional(rollbackFor = Exception.class)
public Long createOrder(AddOrderDto addOrderDto) {
MallMember member = LoginUserUtil.getLoginUser();
-
+ String takeUniqueCode = addOrderDto.getTakeUniqueCode();
+ if(StrUtil.isEmpty(takeUniqueCode)){
+ throw new FebsException("请选择自提点");
+ }
MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId());
if (address == null) {
throw new FebsException("地址不存在");
@@ -215,6 +219,7 @@
}
String payResultStr = "";
+ String wxResultStr = "";
switch (payOrderDto.getType()) {
case "1":
// orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
@@ -225,6 +230,7 @@
} catch (Exception e) {
throw new FebsException("支付失败");
}
+ wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestData);
payResultStr = brandWCPayRequestData.getPrepay_id();
orderInfo.setPayMethod("微信支付");
agentProducer.sendOrderReturn(orderInfo.getId());
@@ -313,6 +319,7 @@
map.put("orderInfo", payResultStr);
map.put("orderNo", orderInfo.getOrderNo());
map.put("orderId", orderInfo.getId());
+ map.put("wxResultStr", wxResultStr);
return map;
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ade8eee..09edaa3 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -66,6 +66,6 @@
xcx:
wechar_login_url: https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
xcx_appid: wx5cc58f796224af61
- xcx_secret: cab68768a444f9e25bb3d1bc208fb546
+ xcx_secret: 71403646f666f9b9dca308d4f357765c
debug: true
- wecharPaynotifyUrl: http://120.27.238.55:8801/api/xcxPay/wxpayCallback
+ wecharPaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/wxpayCallback
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index c32d80a..561c2b7 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -62,6 +62,6 @@
xcx:
wechar_login_url: https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
xcx_appid: wx5cc58f796224af61
- xcx_secret: cab68768a444f9e25bb3d1bc208fb546
+ xcx_secret: 71403646f666f9b9dca308d4f357765c
debug: false
- wecharPaynotifyUrl: http://120.27.238.55:8801/api/xcxPay/wxpayCallback
+ wecharPaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/wxpayCallback
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 78c9d66..dfdbd49 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -64,4 +64,4 @@
xcx_appid: wx5cc58f796224af61
xcx_secret: 71403646f666f9b9dca308d4f357765c
debug: true
- wecharPaynotifyUrl: http://120.27.238.55:8801/api/xcxPay/wxpayCallback
+ wecharPaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/wxpayCallback
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 5b4901c..247081a 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -92,7 +92,7 @@
</if>
</if>
</where>
- order by a.created_time desc
+ GROUP BY a.id order by a.created_time desc
</select>
<select id="getMallOrderInfoById" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderVo">
--
Gitblit v1.9.1