From d00f345e88363d1d2d75350f27ee4b6348d30219 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 18 十月 2023 11:32:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java | 9 ++++-----
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 10 ++++++----
server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java | 4 ++++
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
index 10c5910..a99eba4 100644
--- a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
+++ b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
@@ -46,13 +46,12 @@
WxPayRefundRequest request = new WxPayRefundRequest();
request.setOutTradeNo(refundDTO.getOrderId());
request.setOutRefundNo(refNum);
-// request.setTotalFee(BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString()));
-// request.setRefundFee(BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString()));
+ request.setTotalFee(BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString()));
+ request.setRefundFee(BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString()));
System.out.println("瀹為檯鎬婚噾棰�" + BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString()));
System.out.println("瀹為檯閫�娆鹃噾棰�" + BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString()));
-
- request.setTotalFee(1);
- request.setRefundFee(1);
+// request.setTotalFee(1);
+// request.setRefundFee(1);
WxPayRefundResult response = WxMiniConfig.wxPayService.refund(request);
if ("SUCCESS".equals(response.getReturnCode()) && "SUCCESS".equals(response.getResultCode())) {
//瀛樺偍閫�娆捐褰� 涓� 娴佹按璁板綍
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java
index c06d25c..679e934 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java
@@ -38,4 +38,8 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿寮�濮�")
private Date createDate;
+
+ @ApiModelProperty(value = "鐜板満鎻忚堪")
+ @ExcelColumn(name="鐜板満鎻忚堪")
+ private String content;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index eea7414..d080e2d 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -691,8 +691,8 @@
request.setBody("鏀粯鎶奸噾");
request.setAttach("createGoodsOrder");
request.setOutTradeNo(goodsorder.getId());
-// request.setTotalFee(BaseWxPayRequest.yuanToFen(goodsorder.getMoney().toString()));
- request.setTotalFee(1);
+ request.setTotalFee(BaseWxPayRequest.yuanToFen(goodsorder.getMoney().toString()));
+// request.setTotalFee(1);
request.setSpbillCreateIp(this.getIpAddr());
request.setTimeStart(DateUtil.DateToString(new Date(), "yyyyMMddHHmmss"));
request.setOpenid(member.getOpenid());
@@ -751,8 +751,10 @@
Date date = new Date();
list.forEach(s->{
try {
- goodsorder.setEditDate(date);
- goodsorder.setEditor(null);
+ s.setEditDate(date);
+ s.setEditor(null);
+ s.setCloseDate(date);
+
closeGoodsorder(s,Constants.REFUND_TYPE.PLAT_AUTO.getKey());
}catch (BusinessException e){
--
Gitblit v1.9.3