From 7293185aa78829aa7a5f57e07523f949f8ee3250 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 27 二月 2026 17:45:07 +0800
Subject: [PATCH] 小程序 接口开发
---
server/dmmall_service/src/main/java/com/doumee/core/wx/WxMiniUtilService.java | 4 ++--
server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java | 3 +--
server/dmmall_service/src/main/java/com/doumee/dao/business/GoodsorderMapper.java | 2 +-
server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java | 3 +++
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/core/wx/WxMiniUtilService.java b/server/dmmall_service/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
index 698385b..5deb08a 100644
--- a/server/dmmall_service/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
@@ -46,8 +46,8 @@
request.setOutRefundNo(refNum);
// request.setTotalFee(2);
// request.setRefundFee(1);
- request.setTotalFee(BaseWxPayRequest.yuanToFen(totalPrice.toString()));
- request.setRefundFee(BaseWxPayRequest.yuanToFen(refundPrice.toString()));
+ request.setTotalFee(1);//BaseWxPayRequest.yuanToFen(totalPrice.toString()));
+ request.setRefundFee(1);//BaseWxPayRequest.yuanToFen(refundPrice.toString()));
WxPayRefundResult response = WxMiniConfig.wxPayService.refund(request);
if ("SUCCESS".equals(response.getReturnCode()) && "SUCCESS".equals(response.getResultCode())) {
return refNum;
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/GoodsorderMapper.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/GoodsorderMapper.java
index 7892713..990a839 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/GoodsorderMapper.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/GoodsorderMapper.java
@@ -32,7 +32,7 @@
IPage<MemberOrderResponse> goodsOrderPage(IPage<MemberOrderResponse> page, @Param(Constants.WRAPPER) Wrapper wrapper);
- @Select(" select g.CODE AS code , g.MEMBER_INFO as memberInfo , g.PAY_ORDER_ID as payOrderId , g.REFUND_MONEY refundMoney , g.REFUND_TIME as refundTime, g.REFUND_INFO as refundInfo, g.id as orderId , g.MEMBER_ID as memberId , g.CREATE_DATE as createDate , g.TYPE as orderType , g.STATUS as orderStatus , g.IS_COMMENT as isComment , g.PAY_STATUS as payStatus ," +
+ @Select(" select g.CODE AS code , g.payMethod , g.MEMBER_INFO as memberInfo , g.PAY_ORDER_ID as payOrderId , g.REFUND_MONEY refundMoney , g.REFUND_TIME as refundTime, g.REFUND_INFO as refundInfo, g.id as orderId , g.MEMBER_ID as memberId , g.CREATE_DATE as createDate , g.TYPE as orderType , g.STATUS as orderStatus , g.IS_COMMENT as isComment , g.PAY_STATUS as payStatus ," +
" g.COUPON_PRICE as couponPrice , g.price , g.LINKNAME as linkName , g.LINKPHONE as linkPhone , g.LINKADDR as linkAddress , " +
"g.KD_DATE as kdDate , g.KD_NAME as kdName , g.KD_CODE as kdCode , g.INTEGRAL as integral , SUBDATE(g.CREATE_DATE,interval - 15 minute) as cancelDate , g.PAY_DATE AS payDate , g.DONE_DATE as doneDate " +
" , g.MEMBER_INFO , g.RECEIVE_TYPE as receiveType, s.name as shopName,s.phone as shopPhone ,s.id as shopId,g.exchange_code as exchangeCode , g.mail_price as mailPrice , g.TOTAL_PRICE as totalPrice " +
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java
index fe9aef2..6489992 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java
@@ -122,6 +122,9 @@
@ApiModelProperty(value = "鏀粯鍗曞彿", example = "1")
private String payOrderId;
+ @ApiModelProperty(value = "鏀粯鏂瑰紡 0寰俊鏀粯 1绾夸笅鏀粯", example = "1")
+ private Integer payMethod;
+
@ApiModelProperty(value = "蹇�掑崟鍙�", example = "1")
private String kdCode;
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java
index 2a6d37b..013feaa 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java
@@ -233,12 +233,11 @@
;
IPage<Notice> noticeIPage = noticeMapper.selectPage(page, queryWrapper);
List<NoticeCardDTO> noticeCardDTOs = new ArrayList<>();
- if (CollectionUtils.isEmpty(noticeIPage.getRecords())){
+ if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(noticeIPage.getRecords())){
noticeCardDTOs = noticeIPage.getRecords().stream().map(s -> {
NoticeCardDTO noticeCardDTO = new NoticeCardDTO();
BeanUtils.copyProperties(s, noticeCardDTO);
return noticeCardDTO;
-
}).collect(Collectors.toList());
}
PageData<NoticeCardDTO> pageData = new PageData<>();
--
Gitblit v1.9.3