From 8fd09daba5c89106b4a9aacd8d5ef9354afc93be Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期六, 28 二月 2026 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java | 1
server/dmmall_service/src/main/java/com/doumee/dao/web/request/DealIntegralRequest.java | 4
server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java | 167 ++++++++++++++++++++++++---------
server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java | 1
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Notice.java | 29 +++++
server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java | 3
server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java | 14 ++
server/dmmall_service/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java | 3
server/dmmall_web/src/main/java/com/doumee/api/web/NoticeApi.java | 14 ++
server/dmmall_service/src/main/java/com/doumee/service/business/NoticeService.java | 3
server/dmmall_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java | 5
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 7 +
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java | 4
server/dmmall_web/src/main/java/com/doumee/api/web/CommentApi.java | 1
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 39 +++----
15 files changed, 218 insertions(+), 77 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java b/server/dmmall_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
index 016c782..3fdc912 100644
--- a/server/dmmall_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
+++ b/server/dmmall_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
@@ -109,9 +109,12 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
}
Integer isForbidden = dao.queryForObject(" select COALESCE(STATUS,0) from Member where id = ?", Integer.class, memberId);
- if(isForbidden== Constants.ONE){
+ if(isForbidden == Constants.ONE){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
}
+ if(isForbidden == Constants.TWO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸叉敞閿�,璇疯仈绯荤鐞嗗憳");
+ }
Integer count = dao.queryForObject("select count(1) from Member where id = ?", Integer.class, memberId);
if (count != null && count > 0) {
request.setAttribute(JwtTokenUtil.UserId_Name, memberId);
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 b8b5f7d..0957b51 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
@@ -22,25 +22,25 @@
public static final int FOUR = 4 ;
public static final String LABELS_IMG ="LABELS_IMG" ;
public static final String ORDERSET_REG_INTEGRAL_REWARD_STATUS = "ORDERSET_REG_INTEGRAL_REWARD_STATUS";
- public static final String ORDERSET_SHARE_INTEGRAL_REWARD_STATUS="ORDERSET_SHARE_INTEGRAL_REWARD_STATUS";
- public static final String ORDERSET_REG_COUPON_REWARD_STATUS="ORDERSET_REG_COUPON_REWARD_STATUS";
- public static final String ORDERSET_SHARE_COUPON_REWARD_STATUS="ORDERSET_SHARE_COUPON_REWARD_STATUS";
- public static final String ORDERSET_REG_INTEGRAL_REWARD="ORDERSET_REG_INTEGRAL_REWARD";
- public static final String ORDERSET_SHARE_INTEGRAL_REWARD="ORDERSET_SHARE_INTEGRAL_REWARD";
- public static final String ORDERSET_REG_COUPON_REWARD_LIST="ORDERSET_REG_COUPON_REWARD_LIST";
- public static final String ORDERSET_SHARE_COUPON_REWARD_LIST="ORDERSET_SHARE_COUPON_REWARD_LIST";
- public static final String ORDERSET_RETURN_MEMBER_INTEGRAL_STATUS="ORDERSET_RETURN_MEMBER_INTEGRAL_STATUS";
- public static final String ORDERSET_RETURN_SHOP_INTEGRAL_STATUS="ORDERSET_RETURN_SHOP_INTEGRAL_STATUS";
- public static final String ORDERSET_RETURN_MEMBER_INTEGRAL="ORDERSET_RETURN_MEMBER_INTEGRAL";
- public static final String ORDERSET_RETURN_SHOP_INTEGRAL="ORDERSET_RETURN_SHOP_INTEGRAL";
+ public static final String ORDERSET_SHARE_INTEGRAL_REWARD_STATUS="ORDERSET_SHARE_INTEGRAL_REWARD_STATUS";
+ public static final String ORDERSET_REG_COUPON_REWARD_STATUS="ORDERSET_REG_COUPON_REWARD_STATUS";
+ public static final String ORDERSET_SHARE_COUPON_REWARD_STATUS="ORDERSET_SHARE_COUPON_REWARD_STATUS";
+ public static final String ORDERSET_REG_INTEGRAL_REWARD="ORDERSET_REG_INTEGRAL_REWARD";
+ public static final String ORDERSET_SHARE_INTEGRAL_REWARD="ORDERSET_SHARE_INTEGRAL_REWARD";
+ public static final String ORDERSET_REG_COUPON_REWARD_LIST="ORDERSET_REG_COUPON_REWARD_LIST";
+ public static final String ORDERSET_SHARE_COUPON_REWARD_LIST="ORDERSET_SHARE_COUPON_REWARD_LIST";
+ public static final String ORDERSET_RETURN_MEMBER_INTEGRAL_STATUS="ORDERSET_RETURN_MEMBER_INTEGRAL_STATUS";
+ public static final String ORDERSET_RETURN_SHOP_INTEGRAL_STATUS="ORDERSET_RETURN_SHOP_INTEGRAL_STATUS";
+ public static final String ORDERSET_RETURN_MEMBER_INTEGRAL="ORDERSET_RETURN_MEMBER_INTEGRAL";
+ public static final String ORDERSET_RETURN_SHOP_INTEGRAL="ORDERSET_RETURN_SHOP_INTEGRAL";
- public static final String INTERALSET_DEDUCTINTEGRALLIMIT="INTERALSET_DEDUCTINTEGRALLIMIT";
- public static final String INTERALSET_MININTEGRALPRICELIMIT="INTERALSET_MININTEGRALPRICELIMIT";
- public static final String INTERALSET_INTEGRALINVALIDTYPE="INTERALSET_INTEGRALINVALIDTYPE";
- public static final String INTERALSET_INTEGRALINVALIDCIRCLE="INTERALSET_INTEGRALINVALIDCIRCLE";
- public static final String INTERALSET_INTEGRALRULEINFO="INTERALSET_INTEGRALRULEINFO";
+ public static final String INTERALSET_DEDUCTINTEGRALLIMIT="INTERALSET_DEDUCTINTEGRALLIMIT";
+ public static final String INTERALSET_MININTEGRALPRICELIMIT="INTERALSET_MININTEGRALPRICELIMIT";
+ public static final String INTERALSET_INTEGRALINVALIDTYPE="INTERALSET_INTEGRALINVALIDTYPE";
+ public static final String INTERALSET_INTEGRALINVALIDCIRCLE="INTERALSET_INTEGRALINVALIDCIRCLE";
+ public static final String INTERALSET_INTEGRALRULEINFO="INTERALSET_INTEGRALRULEINFO";
- public static final String ORDERSET_TOTAL_RATE="ORDERSET_TOTAL_RATE";
+ public static final String ORDERSET_TOTAL_RATE="ORDERSET_TOTAL_RATE";
public static final String ORDER_SET ="ORDER_SET" ;
public static final String INTEGRAL_SET ="INTEGRAL_SET" ;
@@ -61,12 +61,12 @@
* mq tag
*/
public interface MQ_TAG{
- String order = "order";
+ String order = "order";
String activity = "activity";
}
public interface MQ_KEY{
- String activity_looknum = "looknum";
- String activity_signup = "signup";
+ String activity_looknum = "looknum";
+ String activity_signup = "signup";
}
public static final String SUCCESS_STR = "SUCCESS" ;
@@ -127,23 +127,23 @@
public static final String POST_COMMENTS="POST_COMMENTS";//鍙戝竷璇勮
public static final String COFFEE_MAP_CONSUME="COFFEE_MAP_CONSUME";//鍜栧暋鍦板浘娑堣垂
- //锛堝彂鐜帮級
+ //锛堝彂鐜帮級
public static final String ACTIVITY_FILE = "ACTIVITY";
- //杞挱锛�
+ //杞挱锛�
public static final String BANNER_FILE = "BANNER";
- //(鍟嗗搧)
+ //(鍟嗗搧)
public static final String GOODS_FILE = "GOODS";
- //(鐢ㄦ埛锛�
+ //(鐢ㄦ埛锛�
public static final String MEMBER_FILE = "MEMBER";
- //鍟嗗
+ //鍟嗗
public static final String SHOP_FILE = "SHOP";
- //(绯荤粺閰嶇疆绛夛級
+ //(绯荤粺閰嶇疆绛夛級
public static final String SYSTEM_FILE = "SYSTEM";
- //(璇勮锛�
+ //(璇勮锛�
public static final String COMMENT_FILE = "COMMENT";
- //鍏朵粬锛�
+ //鍏朵粬锛�
public static final String OTHER_FILE = "OTHER";
- //
+ //
public static final String AFTERSALE_FILE = "AFTERSALE";
public static final String COFFEE_ARTICLE_BACKGROUND = "COFFEE_ARTICLE_BACKGROUND";
@@ -754,7 +754,7 @@
}
public enum ShareType{
-// 0娲诲姩1鎺㈠簵2鍜ㄨ3搴楅摵 4鍟嗗搧5鍒嗕韩閭�璇锋捣鎶�
+ // 0娲诲姩1鎺㈠簵2鍜ㄨ3搴楅摵 4鍟嗗搧5鍒嗕韩閭�璇锋捣鎶�
SHARE_ACTIVITY_ACTIVITY(0,"娲诲姩","娲诲姩"),
SHARE_ACTIVITY_VISITSHOP(1,"鎺㈠簵","鍜ㄨ"),
SHARE_ACTIVITY_NEW(2,"鍜ㄨ","鍜ㄨ"),
@@ -856,29 +856,95 @@
+ //瀵硅薄绫诲瀷 0鍟嗗煄璁㈠崟 1绉垎娴佹按 2浼樻儬鍒稿彂鏀� 3杩囨湡鎻愰啋 4绀惧尯娑堟伅
public enum NoticeType{
+ NOTICE_ORDER_SEND(10,"鍟嗗煄璁㈠崟",0,0,"璁㈠崟宸插彂璐�","鎮ㄨ喘涔扮殑鍟嗗搧璁㈠崟锛歿param} 宸插彂璐�"),
+ NOTICE_ORDER_WRITE_OFF(11,"鍟嗗煄璁㈠崟",0,0,"璁㈠崟宸叉牳閿�","鎮ㄨ喘涔扮殑鍟嗗搧璁㈠崟锛歿param} 宸叉牳閿�"),
+ NOTICE_ORDER_REFUND(12,"鍟嗗煄璁㈠崟",0,0,"璁㈠崟宸查��娆�","鎮ㄨ喘涔扮殑鍟嗗搧璁㈠崟锛歿param} 宸查��娆�"),
-// 0璁㈠崟閫氱煡 1绯荤粺娑堟伅 2浜掑姩娑堟伅 3浼樻儬鍒告彁閱� 4瀹樻柟瀹㈡湇 5娲诲姩鎺ㄨ崘 6鎴戠殑鍏虫敞
+ INTEGRAL_INVITE(20,"绉垎娴佹按",1,0,"绉垎鍙樺姩閫氱煡","閭�璇峰ソ鍙嬫垚鍔燂紝鑾峰緱{param}绉垎"),
- NOTICE_ORDER(0,"0璁㈠崟閫氱煡","0璁㈠崟閫氱煡"),
- NOTICE_SYSTEM(1,"1绯荤粺娑堟伅","1绯荤粺娑堟伅"),
- NOTICE_INTERACTION(2,"浜掑姩娑堟伅","浜掑姩娑堟伅"),
- NOTICE_MEMBER_COUPON(3,"浼樻儬鍒告彁閱�","浼樻儬鍒告彁閱�"),
- NOTICE_ACTIVITY(5,"娲诲姩鎺ㄨ崘","娲诲姩鎺ㄨ崘"),
- NOTICE_MEMBER_FOLLOW(6,"鎴戠殑鍏虫敞","鎴戠殑鍏虫敞")
+ COUPON(30,"浼樻儬鍒稿彂鏀�",2,0,"浼樻儬鍒稿彂鏀�","宸茶幏寰椾紭鎯犲埜锛寋param}"),
+
+
+ EXPIRE_INTEGRAL(40,"绉垎杩囨湡鎻愰啋",3,0,"绉垎鍗冲皢杩囨湡","鎮ㄦ湁{param}绉垎鍗冲皢杩囨湡"),
+ EXPIRE_COUPON(41,"浼樻儬鍒稿彂鏀�",3,0,"浼樻儬鍒稿彂鏀�","鎮ㄦ湁{param}寮犱紭鎯犲埜灏嗗湪{param2}杩囨湡"),
+
+ COMMENT(50,"绀惧尯娑堟伅",4,1,"鏀跺埌璇勮","{param}鍥炲浜嗘偍鐨勮瘎璁�"),
+
;
private Integer key;
+ private String info; //娑堟伅鍚嶇О
+ private Integer objType; //瀵硅薄绫诲瀷 0鍟嗗煄璁㈠崟 1绉垎娴佹按 2浼樻儬鍒稿彂鏀� 3杩囨湡鎻愰啋 4绀惧尯娑堟伅
+ private Integer noticeType; //娑堟伅绫诲瀷 0=绯荤粺娑堟伅锛�1=绀惧尯娑堟伅
+ private String title;//鏍囬
+ private String content; //鎻愮ず鏂囨
- private String type;
-
- private String content;
-
- NoticeType(Integer key, String type, String content) {
+ NoticeType(Integer key,String info, Integer objType, Integer noticeType,String title,String content) {
this.key = key;
- this.type = type;
+ this.objType = objType;
+ this.noticeType = noticeType;
+ this.info = info;
+ this.title = title;
this.content = content;
}
+
+
+ public Integer getKey() {
+ return key;
+ }
+
+ public void setKey(Integer key) {
+ this.key = key;
+ }
+
+
+ public Integer getObjType() {
+ return objType;
+ }
+
+ public void setObjType(Integer objType) {
+ this.objType = objType;
+ }
+
+
+ public Integer getNoticeType() {
+ return noticeType;
+ }
+
+ public void setNoticeType(Integer noticeType) {
+ this.noticeType = noticeType;
+ }
+
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+
}
/**
@@ -904,7 +970,7 @@
SHOP_ORDER(21,"娑堣垂杩旂Н鍒�","浼氬憳${param1}浜ゆ槗鎴愬姛锛岃幏寰�${param}绉垎",0,0),//${param}鏄电О-鎵嬫満鍙�
-// SHOP_ORDER_CANCEL(22,"璁㈠崟鍙栨秷閫�鍥�","璁㈠崟鍙栨秷閫�鍥烇紝閫�鍥�${param}绉垎",0,0),
+ // SHOP_ORDER_CANCEL(22,"璁㈠崟鍙栨秷閫�鍥�","璁㈠崟鍙栨秷閫�鍥烇紝閫�鍥�${param}绉垎",0,0),
SHOP_ORDER_REFUND_INTEGRAL(26,"璁㈠崟閫�娆�","璁㈠崟閫�娆撅紝鎵ｉ櫎璁㈠崟杩旇繕${param}绉垎",0,0),
SHOP_SYSTEM_RECHARGE(23,"绉垎鍙戞斁","骞冲彴濂栧姳锛岃幏寰�${param}绉垎",0,0),
SHOP_SYSTEM_DEDUCT(24,"绉垎鎵ｉ櫎","骞冲彴鎵ｅ噺锛屾秷鑰�${param}绉垎",0,0),
@@ -1362,9 +1428,16 @@
public static String getBankInfo(String bankName, String bankAccount){
return bankName + "("+
- bankAccount.
- replaceAll("^.*(.{4})$", "$1")
- + ")";
+ bankAccount.
+ replaceAll("^.*(.{4})$", "$1")
+ + ")";
}
+
+
+
+
+
+
+
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java
index ee3f768..8736169 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java
@@ -183,6 +183,7 @@
insert.setApplyIds(coupon.getApplyIds());
insert.setApplyType(coupon.getApplyType());
insert.setCouponId(coupon.getId());
+ insert.setMaxPrice(coupon.getMaxPrice());
return insert;
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Notice.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Notice.java
index 970655a..0fee836 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Notice.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Notice.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.utils.Constants;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -80,12 +81,12 @@
@ExcelColumn(name="瀵硅薄缂栫爜")
private Integer objId;
- @ApiModelProperty(value = "瀵硅薄绫诲瀷 0鍟嗗煄璁㈠崟 1绉垎娴佹按 2浜掑姩璇勪环 3浼樻儬鍒� 4鐜伴噾娴佹按", example = "1")
- @ExcelColumn(name="瀵硅薄绫诲瀷 0鍟嗗煄璁㈠崟 1绉垎娴佹按 2浜掑姩璇勪环 3浼樻儬鍒� 4鐜伴噾娴佹按")
+ @ApiModelProperty(value = "瀵硅薄绫诲瀷 0鍟嗗煄璁㈠崟 1绉垎娴佹按 2浼樻儬鍒稿彂鏀� 3杩囨湡鎻愰啋 4绀惧尯娑堟伅", example = "1")
+ @ExcelColumn(name="瀵硅薄绫诲瀷 0鍟嗗煄璁㈠崟 1绉垎娴佹按 2浼樻儬鍒稿彂鏀� 3杩囨湡鎻愰啋 4绀惧尯娑堟伅")
private Integer objType;
- @ApiModelProperty(value = "娑堟伅绫诲瀷 0娑堣垂鑰呮秷鎭紱1=缁忛攢鍟嗘秷鎭紱", example = "1")
- @ExcelColumn(name="娑堟伅绫诲瀷 0娑堣垂鑰呮秷鎭紱1=缁忛攢鍟嗘秷鎭紱")
+ @ApiModelProperty(value = "娑堟伅绫诲瀷 0=绯荤粺娑堟伅锛�1=绀惧尯娑堟伅", example = "1")
+ @ExcelColumn(name="娑堟伅绫诲瀷 0=绯荤粺娑堟伅锛�1=绀惧尯娑堟伅")
private Integer type;
@ApiModelProperty(value = "鐘舵�� 0鏈 1宸茶", example = "1")
@@ -107,4 +108,24 @@
@ApiModelProperty(value = "鏌ヨ绫诲瀷锛�0=绯荤粺娑堟伅锛�1=绀惧尯娑堟伅锛�", example = "1")
@TableField(exist = false)
private Integer queryType;
+
+
+
+ public Notice notice(Constants.NoticeType noticeType,Integer memberId,Integer objId){
+ Notice notice = new Notice();
+ notice.setCreateDate(new Date());
+ notice.setIsdeleted(Constants.ZERO);
+ notice.setMemberId(memberId);
+ notice.setTitle(noticeType.getTitle());
+ notice.setContent(noticeType.getContent());
+ notice.setType(noticeType.getNoticeType());
+ notice.setObjId(objId);
+ notice.setObjType(noticeType.getObjType());
+
+
+ return notice;
+ }
+
+
+
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/request/DealIntegralRequest.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/request/DealIntegralRequest.java
index 36a9cef..cf55400 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/request/DealIntegralRequest.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/request/DealIntegralRequest.java
@@ -1,5 +1,6 @@
package com.doumee.dao.web.request;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -41,5 +42,8 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ @ApiModelProperty(value = "鍚庣鐧诲綍浜�")
+ private LoginUserInfo user;
+
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/NoticeService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/NoticeService.java
index 0c77eac..4fcb911 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/NoticeService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/NoticeService.java
@@ -162,4 +162,7 @@
* @param memberName
*/
void commonNotice(Integer memberId, Integer objId,String memberName );
+
+
+ void autoRead(Integer memberId,Integer noticeType);
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java
index bda96d7..fd94cfb 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java
@@ -1114,6 +1114,7 @@
.selectAs(Labels::getParam,Activity::getParam)
.leftJoin(Labels.class,Labels::getId,Activity::getLabelId)
.eq(Activity::getIsdeleted,Constants.ZERO)
+ .eq(Activity::getStatus,Constants.ZERO)
.eq(Objects.nonNull(model.getLabelId()),Activity::getLabelId,model.getLabelId())
.eq(Objects.nonNull(model.getBrandId()),Activity::getBrandId,model.getBrandId())
.like(StringUtils.isNotBlank(model.getInfo()),Activity::getContent,model.getInfo())
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java
index 53e6716..bdff142 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/BannerServiceImpl.java
@@ -185,7 +185,8 @@
@Override
public List<BannerDTO> findShopBanner() {
Banner banner = new Banner();
- banner.setPosition(Constants.TWO);
+ banner.setPosition(Constants.ZERO);
+ banner.setIsdeleted(Constants.ZERO);
QueryWrapper<Banner> wrapper = new QueryWrapper<>(banner);
wrapper.lambda().orderByDesc(Banner::getSortnum);
List<Banner> banners = bannerMapper.selectList(wrapper);
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 0e23901..42dc97c 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
@@ -1701,6 +1701,9 @@
List<MemberCoupon> memberCouponList = new ArrayList<>();
List<CouponNoticeRequest> requestList = new ArrayList<>();
for (JSONObject jsonObject:shareCouponRewardList) {
+ if(!jsonObject.containsKey("couponId")||!jsonObject.containsKey("num")){
+ continue;
+ }
Integer couponId = jsonObject.getInteger("couponId");
Integer num = jsonObject.getInteger("num");
Coupon coupon = couponMapper.selectById(couponId);
@@ -1709,6 +1712,10 @@
}
MemberCoupon memberCoupon = MemberCoupon.couponToBean(coupon,inviteMember,new Date(),Constants.ONE,null);
for (int i = 0; i < num; i++) {
+ //婊″噺鍗蜂笉浼氱敓鎴恗axPrice 闇�瑕佹牴鎹紭鎯犲埜鍑忓皯閲戦璁剧疆
+ if(Constants.equalsInteger(coupon.getCouponType(),Constants.ZERO)){
+ memberCoupon.setMaxPrice(coupon.getPrice());
+ }
memberCouponList.add(memberCoupon);
}
couponIds = couponIds + (StringUtils.isBlank(couponIds)? ",":"" )+ couponId ;
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 b71f22a..c57306c 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
@@ -174,7 +174,7 @@
integral.setOrderCode(dealIntegralRequest.getOrderCode());
integral.setUserType(Constants.ZERO);
integralMapper.insert(integral);
- LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = dealIntegralRequest.getUser();
memberMapper.update(null,new UpdateWrapper<Member>().lambda()
.eq(Member::getId,member.getId())
.set(Member::getEditDate,new Date())
@@ -564,6 +564,7 @@
dealIntegralRequest.setMemberId(model.getId());
dealIntegralRequest.setRemark(param.getRemark());
dealIntegralRequest.setIntegralObjType(integralObjType);
+ dealIntegralRequest.setUser(user);
this.dealIntegral(dealIntegralRequest,model);
}else{//缁忛攢鍟嗚处鎴�
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 acf2630..64c3ff8 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
@@ -87,6 +87,10 @@
for(Member member : memberList){
for (int i = 0; i < Constants.formatLongNum(param.getNum()); i++) {
MemberCoupon memberCoupon = MemberCoupon.couponToBean(coupon,member,now,Constants.TWO,loginUserInfo);
+ //婊″噺鍗蜂笉浼氱敓鎴恗axPrice 闇�瑕佹牴鎹紭鎯犲埜鍑忓皯閲戦璁剧疆
+ if(Constants.equalsInteger(coupon.getCouponType(),Constants.ZERO)){
+ memberCoupon.setMaxPrice(coupon.getPrice());
+ }
//鎸ㄤ釜閫�
addList.add(memberCoupon);
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index cad8f60..217c3c1 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -321,11 +321,8 @@
AccountResponse accountResponse = new AccountResponse();
if(Objects.nonNull(member)){
memberMapper.updateById(member);
- member.setImgFullUrl(systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
- systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()+member.getImgurl());
- //鍒涘缓token
-// JwtPayLoad payLoad = new JwtPayLoad(Constants.MEMBER_PREFIX+member.getId());
-// String token = JwtTokenUtil.generateToken(payLoad);
+ member.setImgFullUrl(StringUtils.isNotBlank(member.getImgurl())?systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()+member.getImgurl():null);
String token = JwtTokenUtil.generateTokenForRedis(member.getId(), Constants.ZERO, JSONObject.toJSONString(member), redisTemplate);
accountResponse.setToken(token);
accountResponse.setOpenid(openId);
@@ -341,18 +338,8 @@
}
-// @Override
-// public AccountResponse wxLoginTest( Integer memberId){
-// //鍒涘缓token
-//// JwtPayLoad payLoad = new JwtPayLoad(Constants.MEMBER_PREFIX+memberId);
-//// String token = JwtTokenUtil.generateToken(payLoad);
-// String token = JwtTokenUtil.generateTokenForRedis(memberId, Constants.ZERO, JSONObject.toJSONString(null), redisTemplate);
-// AccountResponse accountResponse = new AccountResponse();
-// accountResponse.setToken(token);
-// return accountResponse;
-// }
-
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public AccountResponse wxPhone(WxPhoneRequest wxPhoneRequest){
try {
WxMaPhoneNumberInfo userPhoneInfo = WxMiniConfig.wxMaService.getUserService().getPhoneNumber(wxPhoneRequest.getCode());
@@ -375,23 +362,20 @@
}
member.setIntegral(BigDecimal.ZERO);
member.setPhone(phone);
+ member.setStatus(Constants.ZERO);
}
member.setOpenId(wxPhoneRequest.getOpenid());
member.setEditDate(new Date());
- member.setImgFullUrl(systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
- systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()+member.getImgurl());
+ member.setImgFullUrl(StringUtils.isNotBlank(member.getImgurl())?systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()+member.getImgurl():null);
if(Objects.isNull(member.getId())){
memberMapper.insert(member);
PlatformConfigDTO platformConfigDTO = systemDictDataService.getPlatformConfigDTO();
this.createRegionReward(member,platformConfigDTO);
//鍒涘缓閭�璇疯褰�
this.createInviteRecord(member,platformConfigDTO);
-// member.setSharingCode(this.createShareCode(member.getId()));
memberMapper.updateById(member);
}else{
-// if(StringUtils.isBlank(member.getSharingCode())){
-// member.setSharingCode(this.createShareCode(member.getId()));
-// }
memberMapper.updateById(member);
}
if(Objects.nonNull(wxPhoneRequest.getShopId())){
@@ -438,6 +422,9 @@
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(regCouponRewardList)){
List<MemberCoupon> memberCouponList = new ArrayList<>();
for (JSONObject jsonObject:regCouponRewardList) {
+ if(!jsonObject.containsKey("couponId")||!jsonObject.containsKey("num")){
+ continue;
+ }
Integer couponId = jsonObject.getInteger("couponId");
Integer num = jsonObject.getInteger("num");
Coupon coupon = couponMapper.selectById(couponId);
@@ -446,6 +433,10 @@
}
MemberCoupon memberCoupon = MemberCoupon.couponToBean(coupon,member,new Date(),Constants.ZERO,null);
for (int i = 0; i < num; i++) {
+ //婊″噺鍗蜂笉浼氱敓鎴恗axPrice 闇�瑕佹牴鎹紭鎯犲埜鍑忓皯閲戦璁剧疆
+ if(Constants.equalsInteger(coupon.getCouponType(),Constants.ZERO)){
+ memberCoupon.setMaxPrice(coupon.getPrice());
+ }
memberCouponList.add(memberCoupon);
}
}
@@ -485,6 +476,10 @@
dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.INVITENEWUSER);
dealIntegralRequest.setParam1(member.getNickname());
integralService.dealIntegral(dealIntegralRequest,null);
+ //娣诲姞娑堟伅璁板綍
+
+
+
}
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java
index 013feaa..b188c07 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.NoticeMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
@@ -420,6 +421,19 @@
}
+ @Override
+ public void autoRead(Integer memberId,Integer noticeType){
+ noticeMapper.update(new UpdateWrapper<Notice>().lambda()
+ .set(Notice::getStatus,Constants.ONE)
+ .set(Notice::getEditDate, DateUtil.getCurrDateTime())
+ .eq(Notice::getMemberId,memberId)
+ .ne(Objects.nonNull(noticeType)&&Constants.equalsInteger(noticeType,Constants.ZERO),Notice::getObjType,Constants.TWO)
+ .eq(Objects.nonNull(noticeType)&&Constants.equalsInteger(noticeType,Constants.ONE),Notice::getObjType,Constants.TWO)
+ .eq(Notice::getStatus,Constants.ZERO)
+ );
+ }
+
+
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/CommentApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/CommentApi.java
index 344c970..2094620 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/CommentApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/CommentApi.java
@@ -54,7 +54,6 @@
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<Comment>
*/
- @LoginRequired
@ApiOperation("鍒嗛〉娲诲姩鎺㈠簵璇勮鍥炲鏌ヨ")
@PostMapping("/findActivityReplyCommentDTOPage")
public ApiResponse<PageData<ActivityReplyCommentDTO>> findActivityReplyCommentDTOPage(@RequestBody PageWrap<CommentDTO> pageWrap){
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/NoticeApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/NoticeApi.java
index c734fce..95ce2d2 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/NoticeApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/NoticeApi.java
@@ -56,4 +56,18 @@
return ApiResponse.success(null);
}
+ @LoginRequired
+ @ApiOperation(value = "鐢ㄦ埛鏇存柊闃呰鐘舵��", notes = "灏忕▼搴忕")
+ @GetMapping("/autoRead")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "noticeType", value = "娑堟伅绫诲瀷锛�0=绯荤粺娑堟伅锛�1=绀惧尯娑堟伅", required = true)
+ })
+ public ApiResponse autoRead(@RequestParam Integer noticeType){
+ noticeService.autoRead(getMemberId(),noticeType);
+ return ApiResponse.success(null);
+ }
+
+
+
}
--
Gitblit v1.9.3