From cbe044eba8ed473727dd0a0601d8b88ad2b6f417 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 27 二月 2026 16:04:18 +0800
Subject: [PATCH] 小程序 接口开发
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
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 dd78f76..e3ce6ca 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
@@ -586,6 +586,7 @@
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.selectAll(Goodsorder.class)
+ .eq(pageWrap.getModel().getReceiveType()!=null,Goodsorder::getReceiveType,pageWrap.getModel().getReceiveType())
.eq(pageWrap.getModel().getDistributionShopId()!=null,Goodsorder::getDistributionShopId,pageWrap.getModel().getDistributionShopId())
.eq(pageWrap.getModel().getStatus()!=null,Goodsorder::getStatus,pageWrap.getModel().getStatus())
.eq(pageWrap.getModel().getCode()!=null,Goodsorder::getCode,pageWrap.getModel().getCode())
@@ -766,6 +767,8 @@
}
goodsorder.setPickUpShopId(shop.getId());
goodsorder.setDistributionShopId(shop.getId());
+ goodsorder.setLinkname(member.getName());
+ goodsorder.setLinkphone(member.getPhone());
if(Objects.isNull(member.getBindShopId())){
member.setBindShopId(shop.getId());
member.setBindShopDate(new Date());
@@ -905,7 +908,7 @@
dealIntegralRequest.setObjId(goodsorder.getId());
dealIntegralRequest.setOrderCode(goodsorder.getCode().toString());
dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.MEMBER_ORDER);
- integralService.dealIntegral(dealIntegralRequest);
+ integralService.dealIntegral(dealIntegralRequest,null);
}
if(goodsorder.getPrice().compareTo(orderPayRequest.getTitlePrice())!=Constants.ZERO){
@@ -1191,7 +1194,7 @@
dealIntegralRequest.setObjId(goodsorder.getId());
dealIntegralRequest.setOrderCode(goodsorder.getCode().toString());
dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.MEMBER_ORDER_CANCEL);
- integralService.dealIntegral(dealIntegralRequest);
+ integralService.dealIntegral(dealIntegralRequest,null);
}
//璁㈠崟淇℃伅鍙栨秷
goodsorder.setStatus(Constants.OrderStatus.CLOSE.getKey());
@@ -1268,7 +1271,7 @@
dealIntegralRequest.setObjId(goodsorder.getId());
dealIntegralRequest.setOrderCode(goodsorder.getCode().toString());
dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.MEMBER_ORDER_CANCEL);
- integralService.dealIntegral(dealIntegralRequest);
+ integralService.dealIntegral(dealIntegralRequest,null);
}
//璁㈠崟淇℃伅鍙栨秷
goodsorder.setStatus(Constants.OrderStatus.CLOSE.getKey());
@@ -1653,7 +1656,7 @@
this.orderAddShopIntegral(goodsorder);
//涓嬪崟瀹屾垚 鏍规嵁淇℃伅纭鏄惁闇�瑕佽禒閫侀個璇疯�呬紭鎯犲埜
this.orderDoneRewardInviteCoupon(goodsorder);
- //娑堣垂鑰呯‘璁ゆ敹璐�
+ //璧犻�佹秷璐硅�呬笅鍗曠Н鍒�
this.orderAddMemberIntegral(goodsorder);
//缁忛攢鍟� 缁撶畻閲戦
this.orderAddShopCash(goodsorder);
@@ -1707,7 +1710,6 @@
}
couponIds = couponIds + (StringUtils.isBlank(couponIds)? ",":"" )+ couponId ;
couponNames = couponNames + (StringUtils.isBlank(couponNames)? ",":"" )+ coupon.getName() ;
-
CouponNoticeRequest couponNoticeRequest = new CouponNoticeRequest();
couponNoticeRequest.setMemberCoupon(memberCoupon);
@@ -1801,7 +1803,7 @@
if(Objects.nonNull(member)){
dealIntegralRequest.setParam1(member.getNickname());
}
- integralService.dealShopIntegral(dealIntegralRequest);
+ integralService.dealShopIntegral(dealIntegralRequest,null);
}
}
@@ -1846,7 +1848,7 @@
dealIntegralRequest.setObjId(goodsorder.getId());
dealIntegralRequest.setOrderCode(goodsorder.getCode().toString());
dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.ORDER_DONATE);
- integralService.dealIntegral(dealIntegralRequest);
+ integralService.dealIntegral(dealIntegralRequest,null);
}
}
--
Gitblit v1.9.3