From 417e33605dda0f28366a1d6e13c41198a156e3a7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 27 二月 2026 16:33:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java | 8 +++
server/dmmall_service/src/main/resources/application-dev.yml | 2
server/dmmall_service/src/main/java/com/doumee/dao/web/dto/UserCenterVO.java | 18 +++++++++
server/dmmall_service/src/main/java/com/doumee/dao/business/ShopcartMapper.java | 3 +
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 16 ++++++++
server/dmmall_web/pom.xml | 33 +++++++++++++++-
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopcartServiceImpl.java | 10 +++++
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 5 +-
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java | 14 +++---
9 files changed, 95 insertions(+), 14 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
index 7a0c14a..b8b5f7d 100644
--- a/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -50,6 +50,12 @@
public static final String ABOUT_US = "ABOUT_US";
public static final String SERVER_INTRODUCE = "SERVER_INTRODUCE";
public static final String SERVER_PHONE ="SERVER_PHONE" ;
+ public static final String SHOP_INTEGRAL_BG ="SHOP_INTEGRAL_BG" ;
+ public static final String USER_INVITE_BG ="USER_INVITE_BG" ;
+ public static final String CENTER_INVITE_BG ="CENTER_INVITE_BG" ;
+ public static final String USER_SHARE_BG ="USER_SHARE_BG" ;
+
+
/**
* mq tag
@@ -894,7 +900,7 @@
ORDER_DONE_AMOUNT(16,"璁㈠崟缁撶畻","${param1}璁㈠崟缁撶畻鎴愬姛锛岃幏寰楋骏${param}",0,1),//${param}璁㈠崟缂栧彿锛�${param1}閲戦
WITHDRAW_APPLY(17,"浣欓鎻愮幇","浣欓鎻愮幇宸叉彁浜わ紝娑堣�楋骏${param}",0,1),
WITHDRAW_APPLY_BACK(19,"鎻愮幇閫�鍥�","浣欓鎻愮幇澶辫触锛岃幏寰楋骏${param}",0,1),
- SHOP_ORDER_REFUND_CASH(25,"璁㈠崟閫�娆�","${param1}璁㈠崟閫�娆撅紝鎵ｉ櫎缁撶畻閲戦锟�${param}",0,0),
+ SHOP_ORDER_REFUND_CASH(25,"璁㈠崟缁撶畻閫�鍥�","${param1}璁㈠崟閫�娆撅紝鎵ｉ櫎缁撶畻閲戦锟�${param}",0,0),
SHOP_ORDER(21,"娑堣垂杩旂Н鍒�","浼氬憳${param1}浜ゆ槗鎴愬姛锛岃幏寰�${param}绉垎",0,0),//${param}鏄电О-鎵嬫満鍙�
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/ShopcartMapper.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/ShopcartMapper.java
index ff110ae..4caf5cb 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/ShopcartMapper.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/ShopcartMapper.java
@@ -13,7 +13,8 @@
*/
public interface ShopcartMapper extends BaseMapper<Shopcart> {
- @Select(" select s.id as shopCartId , s.GOODS_SKU_ID as goodsSkuId , s.PRODUCT_ID as goodsId , g.name as goodsName , gs.`NAME` as skuName , s.num , gs.PRICE , ifnull(gs.STATUS,1) as status ," +
+ @Select(" select s.id as shopCartId , s.GOODS_SKU_ID as goodsSkuId , s.PRODUCT_ID as goodsId , g.name as goodsName , gs.`NAME` as skuName , s.num , gs.PRICE ," +
+ " CASE WHEN ( g.ISDELETED = 1 || g.`STATUS` = 1 || gs.ISDELETED = 1 ) THEN 1 ELSE 0 END status," +
"case when gs.IMGURL = '' then g.IMGURL when gs.IMGURL is null then g.IMGURL else gs.IMGURL end imgUrl " +
" from shopcart s left join goods g on s.PRODUCT_ID = g.ID left join goods_sku gs ON s.GOODS_SKU_ID = gs.id " +
" where 1 = 1 and s.member_id = #{memberId} order by s.CREATE_DATE desc ")
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/UserCenterVO.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/UserCenterVO.java
index a4596e7..72f47f1 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/UserCenterVO.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/UserCenterVO.java
@@ -31,4 +31,22 @@
@ApiModelProperty(value = "瀹㈡湇鐢佃瘽 澶氫釜浠�,鍒嗗壊")
private String serverPhone;
+
+
+ @ApiModelProperty(value = "鍟嗘埛绉垎椤甸潰鑳屾櫙鍥�")
+ private String shopIntegralBg;//SHOP_INTEGRAL_BG
+
+ @ApiModelProperty(value = "鐢ㄦ埛閭�璇烽〉闈㈣儗鏅浘")
+ private String userInviteBg;//USER_INVITE_BG
+
+ @ApiModelProperty(value = "涓汉涓績閭�璇疯儗鏅浘")
+ private String centerInviteBg;//CENTER_INVITE_BG
+
+ @ApiModelProperty(value = "鐢ㄦ埛鍒嗕韩閭�璇疯儗鏅浘")
+ private String userShareBg;//USER_SHARE_BG
+
+
+
+
+
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
index 84737ea..05486e9 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -354,7 +354,23 @@
.set(Goods::getEditor,user.getId())
.set(Goods::getStatus,Constants.ONE )
.in(Goods::getId,idList));
+
+ //鎵归噺涓嬫灦 sku鏁版嵁
+ goodsSkuMapper.update(null,new UpdateWrapper<GoodsSku>().lambda()
+ .set(GoodsSku::getEditDate,new Date() )
+ .set(GoodsSku::getEditor,user.getId())
+ .set(GoodsSku::getStatus,Constants.ONE )
+ .eq(GoodsSku::getIsdeleted,Constants.ZERO)
+ .in(GoodsSku::getGoodsId,idList));
return;
+ }else{
+ //鎵归噺涓婃灦 sku鏁版嵁
+ goodsSkuMapper.update(null,new UpdateWrapper<GoodsSku>().lambda()
+ .set(GoodsSku::getEditDate,new Date() )
+ .set(GoodsSku::getEditor,user.getId())
+ .set(GoodsSku::getStatus,Constants.ZERO )
+ .eq(GoodsSku::getIsdeleted,Constants.ZERO)
+ .in(GoodsSku::getGoodsId,idList));
}
long shopNum = shopMapper.selectCount(new QueryWrapper<Shop>().lambda()
.eq(Shop::getIsdeleted,Constants.ZERO)
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 1e7013c..0e23901 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
@@ -770,6 +770,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());
@@ -1657,7 +1659,7 @@
this.orderAddShopIntegral(goodsorder);
//涓嬪崟瀹屾垚 鏍规嵁淇℃伅纭鏄惁闇�瑕佽禒閫侀個璇疯�呬紭鎯犲埜
this.orderDoneRewardInviteCoupon(goodsorder);
- //娑堣垂鑰呯‘璁ゆ敹璐�
+ //璧犻�佹秷璐硅�呬笅鍗曠Н鍒�
this.orderAddMemberIntegral(goodsorder);
//缁忛攢鍟� 缁撶畻閲戦
this.orderAddShopCash(goodsorder);
@@ -1711,7 +1713,6 @@
}
couponIds = couponIds + (StringUtils.isBlank(couponIds)? ",":"" )+ couponId ;
couponNames = couponNames + (StringUtils.isBlank(couponNames)? ",":"" )+ coupon.getName() ;
-
CouponNoticeRequest couponNoticeRequest = new CouponNoticeRequest();
couponNoticeRequest.setMemberCoupon(memberCoupon);
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java
index f51ae78..50aaea8 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java
@@ -70,24 +70,25 @@
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
- public String addBatch(MemberCouponAddDTO memberCoupon){
- checkAddBatchParamValid(memberCoupon);
+ public String addBatch(MemberCouponAddDTO memberCouponAddDTO){
+ checkAddBatchParamValid(memberCouponAddDTO);
- List<Coupon> couponList = getCouponListByParam(memberCoupon);
- List<Member> memberList = getMemberListByParam(memberCoupon);
+ List<Coupon> couponList = getCouponListByParam(memberCouponAddDTO);
+ List<Member> memberList = getMemberListByParam(memberCouponAddDTO);
List<MemberCoupon> addList = new ArrayList<>();
int index =1;
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
Date now = new Date();
- for(Coupon param : memberCoupon.getAddCouponList()){
+ for(Coupon param : memberCouponAddDTO.getAddCouponList()){
Coupon coupon = getCouponFromListById(param.getId(),couponList);
if(coupon == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+index+"銆戜釜浼樻儬鍒告煡璇㈡棤鏁堬紝璇峰埛鏂伴〉闈㈤噸鏂帮紒");
}
for(Member member : memberList){
for (int i = 0; i < Constants.formatLongNum(param.getNum()); i++) {
+ MemberCoupon memberCoupon = MemberCoupon.couponToBean(coupon,member,now,Constants.TWO,loginUserInfo);
//鎸ㄤ釜閫�
- addList.add(MemberCoupon.couponToBean(coupon,member,now,Constants.TWO,loginUserInfo));
+ addList.add(memberCoupon);
}
}
index++;
@@ -97,7 +98,6 @@
memberCouponMapper.insert(addList);
}
return "鎿嶄綔鎴愬姛,鎴愬姛浜哄憳鏁伴噺锛�"+memberList.size()+",鍏卞彂鏀句紭鎯犲埜鏁伴噺锛�"+addList.size();
-
}
/*
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopcartServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopcartServiceImpl.java
index ff78a33..8bc2f8a 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopcartServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopcartServiceImpl.java
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
@@ -271,6 +272,15 @@
userCenterVO.setServerPhone(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_PHONE).getCode()));
userCenterVO.setUserAgreement(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.USER_AGREEMENT).getCode()));
userCenterVO.setPrivacyAgreement(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PRIVACY_AGREEMENT).getCode()));
+
+ userCenterVO.setShopIntegralBg(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SHOP_INTEGRAL_BG).getCode()));
+
+ userCenterVO.setUserInviteBg(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.USER_INVITE_BG).getCode()));
+
+ userCenterVO.setCenterInviteBg(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.CENTER_INVITE_BG).getCode()));
+
+ userCenterVO.setUserShareBg(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.USER_SHARE_BG).getCode()));
+
return userCenterVO;
}
diff --git a/server/dmmall_service/src/main/resources/application-dev.yml b/server/dmmall_service/src/main/resources/application-dev.yml
index b199bf0..173095b 100644
--- a/server/dmmall_service/src/main/resources/application-dev.yml
+++ b/server/dmmall_service/src/main/resources/application-dev.yml
@@ -53,7 +53,7 @@
appSecret: 3462fa186da7cb06c544df8d8664b63a
mchId: 1229817002
mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
- notifyUrl: http://xiaopiqiu2.natapp1.cc/web/api/wxPayNotify #https://dmtest.ahapp.net/dmmall_interface/web/api/wxPayNotify
+ notifyUrl: https://test.doumee.cn/dmmall_web_api/web/api/wxPayNotify
keyPath: /usr/local/apiclient_cert.p12
tencent:
diff --git a/server/dmmall_web/pom.xml b/server/dmmall_web/pom.xml
index 84928ec..4db40e2 100644
--- a/server/dmmall_web/pom.xml
+++ b/server/dmmall_web/pom.xml
@@ -8,9 +8,7 @@
<artifactId>dmmall</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
-
<artifactId>dmmall_web</artifactId>
-
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
@@ -24,4 +22,35 @@
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
+ <build>
+ <finalName>dmmall_web_api</finalName>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <configuration>
+ <fork>true</fork>
+ <mainClass>com.doumee.InterfaceApplication</mainClass>
+ <layout>ZIP</layout>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!--<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>-->
+ </plugins>
+ </build>
</project>
\ No newline at end of file
--
Gitblit v1.9.3