From 580f4d3c2ca9eee53eee95a4de2f6610b790780a Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 12 二月 2026 18:24:13 +0800
Subject: [PATCH] 小程序 接口开发
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java
index a0c6493..5cf3eb0 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java
@@ -155,7 +155,12 @@
integral.setCreator(member.getId());
integral.setIsdeleted(Constants.ZERO);
integral.setTitle(dealIntegralRequest.getIntegralObjType().getName());
- integral.setContent(dealIntegralRequest.getIntegralObjType().getNoteinfo());
+ String info = dealIntegralRequest.getIntegralObjType().getNoteinfo();
+ info = info.replace("${param}",dealIntegralRequest.getIntegralNum().toString());
+ if(StringUtils.isNotBlank(dealIntegralRequest.getParam1())){
+ info = info .replace("${param1}",dealIntegralRequest.getParam1());
+ }
+ integral.setContent(info);
integral.setObjId(dealIntegralRequest.getObjId());
integral.setObjType(dealIntegralRequest.getIntegralObjType().getKey());
integral.setType(dealIntegralRequest.getDealType());
@@ -174,7 +179,7 @@
//绔欏唴淇�
noticeService.saveMemberIntegralNotice(
dealIntegralRequest.getIntegralObjType(),Constants.ZERO,member.getId(),dealIntegralRequest.getIntegralNum(),
- integral.getId(), dealIntegralRequest.getParam1()
+ integral.getId(), info
);
@@ -193,7 +198,12 @@
integral.setCreateDate(new Date());
integral.setIsdeleted(Constants.ZERO);
integral.setTitle(dealIntegralRequest.getIntegralObjType().getName());
- integral.setContent(dealIntegralRequest.getIntegralObjType().getNoteinfo());
+ String info = dealIntegralRequest.getIntegralObjType().getNoteinfo();
+ info = info.replace("${param}",dealIntegralRequest.getIntegralNum().toString());
+ if(StringUtils.isNotBlank(dealIntegralRequest.getParam1())){
+ info = info .replace("${param1}",dealIntegralRequest.getParam1());
+ }
+ integral.setContent(info);
integral.setObjId(dealIntegralRequest.getObjId());
integral.setObjType(dealIntegralRequest.getIntegralObjType().getKey());
integral.setType(dealIntegralRequest.getDealType());
@@ -203,16 +213,18 @@
integral.setUserType(Constants.ONE);
integralMapper.insert(integral);
if(dealIntegralRequest.getDealType().equals(Constants.ZERO)){
+
shopMapper.addIntegral(shop.getId(),dealIntegralRequest.getIntegralNum(),
dealIntegralRequest.getIntegralObjType().getAddTitle()==Constants.ZERO?dealIntegralRequest.getIntegralNum():BigDecimal.ZERO);
}else{
+
shopMapper.subtractIntegral(shop.getId(),dealIntegralRequest.getIntegralNum());
}
//绔欏唴淇�
noticeService.saveMemberIntegralNotice(
dealIntegralRequest.getIntegralObjType(),Constants.ZERO,shop.getId(),dealIntegralRequest.getIntegralNum(),
- integral.getId(), dealIntegralRequest.getParam1()
+ integral.getId(), info
);
return integral.getId();
}
@@ -230,11 +242,16 @@
integral.setCreateDate(new Date());
integral.setIsdeleted(Constants.ZERO);
integral.setTitle(dealIntegralRequest.getIntegralObjType().getName());
- integral.setContent(dealIntegralRequest.getIntegralObjType().getNoteinfo());
+ integral.setNum(dealIntegralRequest.getIntegralNum());
+ String info = dealIntegralRequest.getIntegralObjType().getNoteinfo();
+ info = info.replace("${param}",integral.getNum().toString());
+ if(StringUtils.isNotBlank(dealIntegralRequest.getParam1())){
+ info = info .replace("${param1}",dealIntegralRequest.getParam1());
+ }
+ integral.setContent(info);
integral.setObjId(dealIntegralRequest.getObjId());
integral.setObjType(dealIntegralRequest.getIntegralObjType().getKey());
integral.setType(dealIntegralRequest.getDealType());
- integral.setNum(dealIntegralRequest.getIntegralNum());
integral.setTotalNum(dealIntegralRequest.getDealType().equals(Constants.ZERO)? shop.getAmount().add(integral.getNum()):shop.getAmount().subtract(integral.getNum()));
integral.setOrderCode(dealIntegralRequest.getOrderCode());
integral.setUserType(Constants.TWO);
@@ -544,12 +561,17 @@
}
@Override
public IntegralDataResponse getIntegralData(IntegralRecordDTO model){
+ if(Objects.isNull(model)
+ || Objects.isNull(model.getUserType())
+ || Objects.isNull(model.getMemberId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
IntegralDataResponse integralDataResponse = new IntegralDataResponse();
integralDataResponse.setSurplusIntegral(BigDecimal.ZERO);
integralDataResponse.setExpiredIntegral(BigDecimal.ZERO);
List<Integral> list = integralMapper.selectList(new QueryWrapper<Integral>().lambda()
.eq(Objects.nonNull(model.getUserType()),Integral::getUserType,model.getUserType())
- .eq(Objects.nonNull(model.getType()),Integral::getType,model.getType())
+// .eq(Objects.nonNull(model.getType()),Integral::getType,model.getType())
.eq(Integral::getMemberId,model.getMemberId())
.orderByDesc(Integral::getCreateDate));
@@ -562,7 +584,7 @@
//绉垎澶辨晥鏂瑰紡 0闀挎湡鏈夋晥 1鎸夌Н鍒嗕骇鐢熸椂闂村け鏁�
Integer type = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.INTEGRAL_SET, Constants.INTERALSET_INTEGRALINVALIDTYPE).getCode());
//娑堣垂鑰呯Н鍒� 闇�瑕佹煡璇㈠嵆灏嗚繃鏈熺Н鍒�
- if(Constants.equalsInteger(type,Constants.ZERO)){
+ if(Constants.equalsInteger(type,Constants.ONE)){
Integer validYear = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.INTEGRAL_SET, Constants.INTERALSET_INTEGRALINVALIDCIRCLE).getCode());
if(validYear.compareTo(Constants.ZERO)>Constants.ZERO){
list = integralMapper.selectList(new QueryWrapper<Integral>().lambda()
--
Gitblit v1.9.3