From 212a59db0f342924c0ad72e8ec640684de514702 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 17 三月 2026 10:01:00 +0800
Subject: [PATCH] 123
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java | 101 ++++++++++++++++++++++++++++++--------------------
1 files changed, 60 insertions(+), 41 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
index 61c08ad..13ea867 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
@@ -146,6 +146,8 @@
shop.setIsrec(Constants.ONE);
shop.setOrigin(Constants.ONE);
shop.setSaleType(Constants.formatIntegerNum(shop.getSaleType()));
+ shop.setAmount(BigDecimal.ZERO);
+ shop.setTotalAmount(BigDecimal.ZERO);
String salt = RandomStringUtils.randomAlphabetic(6);
shop.setPassword(shop.getCode()+"@123456");
@@ -160,12 +162,15 @@
.set(Shop::getProgramCode,url)
.eq(Shop::getId,shop.getId()));
}
- //鍒嗕韩娴锋姤
- String posterUrl = inviteRecordService.createShareImg(Constants.ONE,shop.getId(),shop.getPosterImg());
- if(StringUtils.isNotBlank(posterUrl)){
- shopMapper.update(null,new UpdateWrapper<Shop>().lambda()
- .set(Shop::getPosterImgCode,posterUrl)
- .eq(Shop::getId,shop.getId()));
+ if(StringUtils.isNotBlank(shop.getPosterImg())) {
+ //鍒嗕韩娴锋姤
+ String posterUrl = inviteRecordService.createShareImg(Constants.ONE, shop.getId(), shop.getPosterImg());
+ //鐢熸垚澶辫触浼氱敓鎴愬瓧绗︿覆 1
+ if (StringUtils.isNotBlank(posterUrl)&&!posterUrl.equals("1")) {
+ shopMapper.update(null, new UpdateWrapper<Shop>().lambda()
+ .set(Shop::getPosterImgCode, posterUrl)
+ .eq(Shop::getId, shop.getId()));
+ }
}
return shop.getId();
}
@@ -258,17 +263,16 @@
shop.setEditor(user.getId());
shop.setEditDate(new Date());
- if(StringUtils.isBlank(model.getProgramCode())){
- //鍒嗕韩鐮�
- String url = inviteRecordService.createShopMiniProgramCode(shop.getId());
- if(StringUtils.isNotBlank(url)){
- shop.setProgramCode(url);
- }
+ //鍒嗕韩鐮�
+ String url = inviteRecordService.createShopMiniProgramCode(shop.getId());
+ if(StringUtils.isNotBlank(url)){
+ shop.setProgramCode(url);
}
if(StringUtils.isNotBlank(shop.getPosterImg())){
//鍒嗕韩娴锋姤
String posterUrl = inviteRecordService.createShareImg(Constants.ONE,shop.getId(),shop.getPosterImg());
- if(StringUtils.isNotBlank(posterUrl)){
+ //鐢熸垚澶辫触浼氱敓鎴愬瓧绗︿覆 1
+ if (StringUtils.isNotBlank(posterUrl)&&!posterUrl.equals("1")) {
shop.setPosterImgCode(posterUrl);
}
}
@@ -282,8 +286,8 @@
shop.getEditDate(),
new String[]{user.getUsername(), DateUtil.getPlusTime2(shop.getEditDate())},
JSONObject.toJSONString(shop) ,
- Constants.equalsInteger(model.getSaleType(),Constants.ONE)?"鑷敱閲囪喘":"骞冲彴閾鸿揣",
- Constants.equalsInteger(shop.getSaleType(),Constants.ONE)?"鑷敱閲囪喘":"骞冲彴閾鸿揣");
+ Constants.equalsInteger(model.getSaleType(),Constants.ONE)?"鑷富閲囪喘":"骞冲彴閾鸿揣",
+ Constants.equalsInteger(shop.getSaleType(),Constants.ONE)?"鑷富閲囪喘":"骞冲彴閾鸿揣");
}
}
@@ -722,9 +726,7 @@
String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.SHOP_FILE).getCode();
for(Shop model:shopList){
-
model.setImgFullUrl(StringUtils.isNotBlank(model.getImgurl())?path+model.getImgurl():null);
-
}
return shopList;
}
@@ -782,6 +784,7 @@
if(!pwd.equals(shop.getPassword())){
throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
}
+ shop.setOpenId(dto.getOpenid());
//鍒涘缓token
// JwtPayLoad payLoad = new JwtPayLoad(Constants.SHOP_PREFIX+shop.getId());
// String token = JwtTokenUtil.generateToken(payLoad);
@@ -892,34 +895,53 @@
//鑷畾涔夋棩鏈�
.apply(Objects.nonNull(request.getDateType())&&Constants.equalsInteger(request.getDateType(),Constants.FOUR)&&StringUtils.isNotBlank(request.getStartDate()), " t.CREATE_DATE >= '"+request.getStartDate()+" 00:00:00'")
.apply(Objects.nonNull(request.getDateType())&&Constants.equalsInteger(request.getDateType(),Constants.FOUR)&&StringUtils.isNotBlank(request.getEndDate()), " t.CREATE_DATE <= '"+request.getEndDate()+" 23:59:59'")
- .ne(Goodsorder::getStatus,Constants.OrderStatus.CLOSE.getKey())
+ .in(Goodsorder::getStatus,Constants.OrderStatus.PAY_DONE.getKey(),Constants.OrderStatus.WAIT_RECEIVE.getKey(),Constants.OrderStatus.DONE.getKey())
.orderByDesc(Goodsorder::getId)
);
if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(goodsorderList)) {
- saleReportResponse.setSaleTotal(goodsorderList.stream().map(i->i.getPrice().subtract(i.getMailPrice())).reduce(BigDecimal.ZERO, BigDecimal::add));
+ saleReportResponse.setSaleTotal(goodsorderList.stream().map(i->i.getTotalPrice().subtract(i.getMailPrice())).reduce(BigDecimal.ZERO, BigDecimal::add));
saleReportResponse.setOrderNum(goodsorderList.size());
}
- List<Integral> integralList = integralMapper.selectList(new QueryWrapper<Integral>().lambda()
- .eq(Integral::getIsdeleted,Constants.ZERO)
- .eq(Integral::getMemberId,shopId)
- .eq(Integral::getUserType,Constants.TWO)
- .eq(Integral::getType,Constants.ZERO)
- .eq(Integral::getObjType,Constants.IntegralObjType.ORDER_DONE_AMOUNT.getKey())
- //浠婃棩
- .apply(Constants.equalsInteger(request.getDateType(),Constants.ZERO), " DATE(CREATE_DATE) = DATE(NOW()) ")
- //褰撴湀
- .apply(Constants.equalsInteger(request.getDateType(),Constants.ONE), " DATE_FORMAT(CREATE_DATE, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m')")
- //涓婃湀
- .apply(Constants.equalsInteger(request.getDateType(),Constants.TWO), " DATE_FORMAT(CREATE_DATE, '%Y-%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m') ")
- //鍥哄畾鏈堜唤
- .apply(Constants.equalsInteger(request.getDateType(),Constants.THREE)&&StringUtils.isNotBlank(request.getStartDate()), " DATE_FORMAT(CREATE_DATE, '%Y-%m') = DATE_FORMAT(DATE_SUB('"+request.getStartDate()+"', INTERVAL 1 MONTH), '%Y-%m') ")
- //鑷畾涔夋棩鏈�
- .apply(Constants.equalsInteger(request.getDateType(),Constants.FOUR)&&StringUtils.isNotBlank(request.getStartDate()), " CREATE_DATE >= '"+request.getStartDate()+" 00:00:00'")
- .apply(Constants.equalsInteger(request.getDateType(),Constants.FOUR)&&StringUtils.isNotBlank(request.getEndDate()), " CREATE_DATE <= '"+request.getEndDate()+" 23:59:59'")
+// List<Integral> integralList = integralMapper.selectList(new QueryWrapper<Integral>().lambda()
+// .eq(Integral::getIsdeleted,Constants.ZERO)
+// .eq(Integral::getMemberId,shopId)
+// .eq(Integral::getUserType,Constants.TWO)
+// .eq(Integral::getType,Constants.ZERO)
+// .eq(Integral::getObjType,Constants.IntegralObjType.ORDER_DONE_AMOUNT.getKey())
+// //浠婃棩
+// .apply(Constants.equalsInteger(request.getDateType(),Constants.ZERO), " DATE(CREATE_DATE) = DATE(NOW()) ")
+// //褰撴湀
+// .apply(Constants.equalsInteger(request.getDateType(),Constants.ONE), " DATE_FORMAT(CREATE_DATE, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m')")
+// //涓婃湀
+// .apply(Constants.equalsInteger(request.getDateType(),Constants.TWO), " DATE_FORMAT(CREATE_DATE, '%Y-%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m') ")
+// //鍥哄畾鏈堜唤
+// .apply(Constants.equalsInteger(request.getDateType(),Constants.THREE)&&StringUtils.isNotBlank(request.getStartDate()), " DATE_FORMAT(CREATE_DATE, '%Y-%m') = DATE_FORMAT(DATE_SUB('"+request.getStartDate()+"', INTERVAL 1 MONTH), '%Y-%m') ")
+// //鑷畾涔夋棩鏈�
+// .apply(Constants.equalsInteger(request.getDateType(),Constants.FOUR)&&StringUtils.isNotBlank(request.getStartDate()), " CREATE_DATE >= '"+request.getStartDate()+" 00:00:00'")
+// .apply(Constants.equalsInteger(request.getDateType(),Constants.FOUR)&&StringUtils.isNotBlank(request.getEndDate()), " CREATE_DATE <= '"+request.getEndDate()+" 23:59:59'")
+// );
+ goodsorderList = goodsorderJoinMapper.selectJoinList(Goodsorder.class,
+ new MPJLambdaWrapper<Goodsorder>()
+ .selectAll(Goodsorder.class)
+ .eq(Goodsorder::getIsdeleted,Constants.ZERO)
+ .eq(Goodsorder::getDistributionShopId,shopId)
+ //浠婃棩
+ .apply(Objects.nonNull(request.getDateType())&&Constants.equalsInteger(request.getDateType(),Constants.ZERO), " DATE(t.DONE_DATE) = DATE(NOW()) ")
+ //褰撴湀
+ .apply(Objects.nonNull(request.getDateType())&&Constants.equalsInteger(request.getDateType(),Constants.ONE), " DATE_FORMAT(t.DONE_DATE, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m')")
+ //涓婃湀
+ .apply(Objects.nonNull(request.getDateType())&&Constants.equalsInteger(request.getDateType(),Constants.TWO), " DATE_FORMAT(t.DONE_DATE, '%Y-%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m') ")
+ //鍥哄畾鏈堜唤
+ .apply(Objects.nonNull(request.getDateType())&&Constants.equalsInteger(request.getDateType(),Constants.THREE)&&StringUtils.isNotBlank(request.getStartDate()), " DATE_FORMAT(t.DONE_DATE, '%Y-%m') = DATE_FORMAT(DATE_SUB('"+request.getStartDate()+"', INTERVAL 1 MONTH), '%Y-%m') ")
+ //鑷畾涔夋棩鏈�
+ .apply(Objects.nonNull(request.getDateType())&&Constants.equalsInteger(request.getDateType(),Constants.FOUR)&&StringUtils.isNotBlank(request.getStartDate()), " t.DONE_DATE >= '"+request.getStartDate()+" 00:00:00'")
+ .apply(Objects.nonNull(request.getDateType())&&Constants.equalsInteger(request.getDateType(),Constants.FOUR)&&StringUtils.isNotBlank(request.getEndDate()), " t.DONE_DATE <= '"+request.getEndDate()+" 23:59:59'")
+ .in(Goodsorder::getStatus,Constants.OrderStatus.DONE.getKey())
+ .orderByDesc(Goodsorder::getId)
);
- if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(integralList)) {
- saleReportResponse.setProfitTotal(integralList.stream().map(i->i.getNum()).reduce(BigDecimal.ZERO, BigDecimal::add));
+ if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(goodsorderList)) {
+ saleReportResponse.setProfitTotal(goodsorderList.stream().filter(i->Objects.nonNull(i.getShopSettlement())).map(i->i.getShopSettlement()).reduce(BigDecimal.ZERO, BigDecimal::add));
}
return saleReportResponse;
}
@@ -977,9 +999,6 @@
}
redisTemplate.delete(token);
}
-
-
-
}
--
Gitblit v1.9.3