From 3b8100c9b5e00e627b33c25f80fedac98e00b7dd Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 19 一月 2026 16:22:04 +0800
Subject: [PATCH] 小程序 接口开发
---
server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderPayConfirmResponse.java | 2 --
server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java | 2 --
server/dmmall_service/src/main/java/com/doumee/dao/business/GoodsorderMapper.java | 4 ++--
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 7 ++-----
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 6 ++++--
5 files changed, 8 insertions(+), 13 deletions(-)
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 d031664..f5d15e1 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
@@ -23,7 +23,7 @@
@Select(" select g.CODE AS code , g.id as orderId , 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_PRICE as integral , SUBDATE(g.CREATE_DATE,interval - 15 minute) as cancelDate , g.PAY_DATE AS payDate , g.DONE_DATE as doneDate " +
+ "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.id as shopId ,g.exchange_code as exchangeCode " +
" from goodsorder g left join shop s on g.PICK_UP_SHOP_ID = s.id " +
" ${ew.customSqlSegment} ")
@@ -32,7 +32,7 @@
@Select(" select g.CODE AS code , g.remark as remark , 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_PRICE as integral , SUBDATE(g.CREATE_DATE,interval - 15 minute) as cancelDate , g.PAY_DATE AS payDate , g.DONE_DATE as doneDate " +
+ "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.id as shopId,g.exchange_code as exchangeCode " +
" from goodsorder g left join shop s on g.PICK_UP_SHOP_ID = s.id " +
" where g.id = #{id} ")
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
index 44e732e..3472592 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -102,8 +102,6 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "浣欓浣跨敤鏁伴噺", example = "1")
- private BigDecimal integral;
@ApiModelProperty(value = "鍞悗宸查��娆鹃噾棰�", example = "1")
private BigDecimal aftersaleMoney;
@@ -184,11 +182,10 @@
@ApiModelProperty(value = "绉垎鎶垫墸閲戦", example = "1")
- private BigDecimal integralPrice;
+ private BigDecimal integral;
@ApiModelProperty(value = "娑堣�楃Н鍒嗗��", example = "1")
private BigDecimal useIntegral;
-
@ApiModelProperty(value = "鍜栧暋璁″垝璁㈠崟褰㈠紡 0鏂板 1寤堕暱", example = "1")
private Integer planOrderType;
@@ -205,7 +202,7 @@
@ApiModelProperty(value = "鏍搁攢鐮�", example = "1")
private String exchangeCode;
- @ApiModelProperty(value = "璁㈠崟缁撶畻閲戦")
+ @ApiModelProperty(value = "缁忛攢鍟嗙粨绠楅噾棰�", example = "1")
private BigDecimal shopSettlement;
@ApiModelProperty(value = "鏂囦欢鍦板潃")
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java
index d1db85a..c954311 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java
@@ -102,8 +102,6 @@
private BigDecimal shopSettlement;
-
-
@ApiModelProperty(value = "鍟嗗搧鏍囩鍚嶇О")
@TableField(exist = false)
private String lablesName;
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderPayConfirmResponse.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderPayConfirmResponse.java
index c3c1275..5169238 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderPayConfirmResponse.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderPayConfirmResponse.java
@@ -24,8 +24,6 @@
@ApiModelProperty(value = "浼樻儬鍒告姷鎵ｉ噾棰�", example = "1")
private BigDecimal couponAmount;
-
-
@ApiModelProperty(value = "绉垎浣跨敤鐘舵�侊細0=鍙敤锛�1=涓嶅彲鐢�", example = "1")
private Integer integralStatus;
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index f2bb0e8..f098231 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -801,8 +801,7 @@
goodsorder.setPrice(orderPayConfirmResponse.getPayAmount());
goodsorder.setTotalPrice(orderPayConfirmResponse.getAmount());
goodsorder.setUseIntegral(orderPayConfirmResponse.getDeductIntegral());
- goodsorder.setIntegral(goodsorder.getUseIntegral());
- goodsorder.setIntegralPrice(orderPayConfirmResponse.getIntegralAmount());
+ goodsorder.setIntegral(orderPayConfirmResponse.getIntegralAmount());
goodsorder.setMailPrice(orderPayConfirmResponse.getMailAmount());
goodsorder.setPayMethod(goodsorder.getPrice().compareTo(BigDecimal.ZERO)>Constants.ZERO?Constants.ZERO:Constants.ONE);
if(Objects.nonNull(orderPayConfirmResponse.getMemberCoupon())){
@@ -1403,7 +1402,10 @@
);
if(Objects.nonNull(areas)){
Labels labels = labelsMapper.selectById(areas.getYunFeeId());
+ if(Objects.nonNull(labels)&&StringUtils.isNotBlank(labels.getParam())){
+ //{weight0:10,fee0:10,weight1:10,fee1:10},{棣栭噸:10,棣栭噸杩愯垂锛�10,缁噸锛�10,缁噸璐癸細10}
+ }
}
--
Gitblit v1.9.3