From 1a6a034373a07c5ce7b5a442b7ddf5842fc4e7b4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 30 Aug 2022 14:40:00 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/mall/mapper/MallOrderItemMapper.java | 2 ++
src/main/resources/mapper/modules/MallOrderItemMapper.xml | 5 +++++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 7 +++++++
src/main/resources/application-dev.yml | 12 ++++++------
src/main/resources/application-prod.yml | 12 ++++++------
src/main/resources/application-test.yml | 21 +++++++++++++++------
6 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderItemMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderItemMapper.java
index bd72853..c8b1298 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderItemMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderItemMapper.java
@@ -9,4 +9,6 @@
public interface MallOrderItemMapper extends BaseMapper<MallOrderItem> {
List<MallOrderItem> selectItemByGoodsIdUnCancel(@Param("goodsId") Long goodsId, @Param("memberId") Long memberId);
+
+ List<MallOrderItem> selectListByStateAndOrderId(@Param("state")Integer i, @Param("orderId")Long orderId);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index 929f6f4..0bb5810 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -324,6 +324,13 @@
mallRefundEntity.setState(1);
mallRefundMapper.updateById(mallRefundEntity);
mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
+
+ List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
+ if(CollUtil.isNotEmpty(mallOrderItemList)){
+ MallOrderInfo mallOrderRefund = mallOrderInfoMapper.selectById(orderId);
+ mallOrderRefund.setStatus(6);
+ mallOrderInfoMapper.updateById(mallOrderRefund);
+ }
}else{
mallRefundEntity.setState(2);
mallRefundMapper.updateById(mallRefundEntity);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 8cba712..98fed55 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -65,10 +65,10 @@
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: 71403646f666f9b9dca308d4f357765c
- debug: true
+ xcx_appid: wx0b515f652282158e
+ xcx_secret: 8d3d3c14221f7dc37650b861dc0fc570
+ debug: false
wecharPaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/wxpayCallback
- certLocalPath: /home/xuncongCert/apiclient_cert.p12
- wecharpayMchid: 1605533690
- wecharpaySecret: CSxc168888CSxc168888CSxc168888xc
+ certLocalPath: /home/yyscCert/apiclient_cert.p12
+ wecharpayMchid: 1631084809
+ wecharpaySecret: YYSC13875978057YYSC13875978057SH
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index ca0815b..6e1a607 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -61,10 +61,10 @@
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: 71403646f666f9b9dca308d4f357765c
- debug: true
+ xcx_appid: wx0b515f652282158e
+ xcx_secret: 8d3d3c14221f7dc37650b861dc0fc570
+ debug: false
wecharPaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/wxpayCallback
- certLocalPath: /home/xuncongCert/apiclient_cert.p12
- wecharpayMchid: 1605533690
- wecharpaySecret: CSxc168888CSxc168888CSxc168888xc
+ certLocalPath: /home/yyscCert/apiclient_cert.p12
+ wecharpayMchid: 1631084809
+ wecharpaySecret: YYSC13875978057YYSC13875978057SH
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 17463e2..e494984 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -59,12 +59,21 @@
noticeUrl: http://120.27.238.55:8801/api/pay/aliCallBack
domain: https://openapi.alipaydev.com/gateway.do
+#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: 71403646f666f9b9dca308d4f357765c
+# debug: true
+# wecharPaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/wxpayCallback
+# certLocalPath: /home/xuncongCert/apiclient_cert.p12
+# wecharpayMchid: 1605533690
+# wecharpaySecret: CSxc168888CSxc168888CSxc168888xc
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: 71403646f666f9b9dca308d4f357765c
- debug: true
+ xcx_appid: wx0b515f652282158e
+ xcx_secret: 8d3d3c14221f7dc37650b861dc0fc570
+ debug: false
wecharPaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/wxpayCallback
- certLocalPath: /home/xuncongCert/apiclient_cert.p12
- wecharpayMchid: 1605533690
- wecharpaySecret: CSxc168888CSxc168888CSxc168888xc
+ certLocalPath: /home/yyscCert/apiclient_cert.p12
+ wecharpayMchid: 1631084809
+ wecharpaySecret: YYSC13875978057YYSC13875978057SH
diff --git a/src/main/resources/mapper/modules/MallOrderItemMapper.xml b/src/main/resources/mapper/modules/MallOrderItemMapper.xml
index 432e2fe..60c211a 100644
--- a/src/main/resources/mapper/modules/MallOrderItemMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderItemMapper.xml
@@ -8,4 +8,9 @@
where a.goods_id=#{goodsId} and b.member_id=#{memberId}
</select>
+ <select id="selectListByStateAndOrderId" resultType="cc.mrbird.febs.mall.entity.MallOrderItem">
+ select a.* from mall_order_item a
+ where a.state=#{state} and b.order_id=#{orderId}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1