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/system/impl/SystemUserServiceImpl.java | 10 ++--
server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java | 2
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java | 3 -
server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java | 9 +++-
server/dmmall_service/src/main/java/com/doumee/dao/web/dto/NoticeCardDTO.java | 2
server/dmmall_service/src/main/java/com/doumee/service/business/impl/CollectServiceImpl.java | 4 +-
server/dmmall_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java | 8 ++--
server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java | 1
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Collect.java | 4 ++
server/dmmall_web/src/main/resources/application.yml | 2
server/dmmall_service/src/main/resources/application-pro.yml | 6 +-
server/dmmall_admin/src/main/resources/application.yml | 2
server/dmmall_admin/src/main/java/com/doumee/api/business/ActivityController.java | 1
server/dmmall_admin/src/main/java/com/doumee/api/business/AftersaleController.java | 7 +--
14 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/server/dmmall_admin/src/main/java/com/doumee/api/business/ActivityController.java b/server/dmmall_admin/src/main/java/com/doumee/api/business/ActivityController.java
index a986f90..958646f 100644
--- a/server/dmmall_admin/src/main/java/com/doumee/api/business/ActivityController.java
+++ b/server/dmmall_admin/src/main/java/com/doumee/api/business/ActivityController.java
@@ -50,6 +50,7 @@
@GetMapping("/delete/batch")
@RequiresPermissions("business:activity:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
for (String id : idArray) {
diff --git a/server/dmmall_admin/src/main/java/com/doumee/api/business/AftersaleController.java b/server/dmmall_admin/src/main/java/com/doumee/api/business/AftersaleController.java
index 307fd1e..58fa80c 100644
--- a/server/dmmall_admin/src/main/java/com/doumee/api/business/AftersaleController.java
+++ b/server/dmmall_admin/src/main/java/com/doumee/api/business/AftersaleController.java
@@ -1,8 +1,7 @@
package com.doumee.api.business;
import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
@@ -15,9 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
+
/**
* @author 姹熻箘韫�
diff --git a/server/dmmall_admin/src/main/resources/application.yml b/server/dmmall_admin/src/main/resources/application.yml
index b3e6363..1df4a1a 100644
--- a/server/dmmall_admin/src/main/resources/application.yml
+++ b/server/dmmall_admin/src/main/resources/application.yml
@@ -8,7 +8,7 @@
# application:
# name: doumeemes
profiles:
- active: pro
+ active: dev
# JSON杩斿洖閰嶇疆
jackson:
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 f6978ea..87fb6f5 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
@@ -112,22 +112,22 @@
}
String openid = member.getOpenId();
Integer memberId = getTokenId(token);
- Integer isDeleted = dao.queryForObject(" select COALESCE(ISDELETED,0) from Member where id = ?", Integer.class, memberId);
+ Integer isDeleted = dao.queryForObject(" select COALESCE(ISDELETED,0) from member where id = ?", Integer.class, memberId);
if(isDeleted== Constants.ONE){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
}
- Integer isForbidden = dao.queryForObject(" select COALESCE(STATUS,0) from Member where id = ?", Integer.class, memberId);
+ Integer isForbidden = dao.queryForObject(" select COALESCE(STATUS,0) from member where id = ?", Integer.class, memberId);
if(isForbidden == Constants.ONE){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
}
if(isForbidden == Constants.TWO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸叉敞閿�,璇疯仈绯荤鐞嗗憳");
}
- String dbOpenid = dao.queryForObject(" select ifnull(open_id,'') from Member where id = ?", String.class, memberId);
+ String dbOpenid = dao.queryForObject(" select ifnull(open_id,'') from member where id = ?", String.class, memberId);
if(StringUtils.isBlank(dbOpenid)||!openid.equals(dbOpenid)){
throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�");
}
- Integer count = dao.queryForObject("select count(1) from Member where id = ?", Integer.class, memberId);
+ 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);
return true;
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Collect.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Collect.java
index cc4972c..c0b42cd 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Collect.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Collect.java
@@ -110,6 +110,10 @@
@TableField(exist = false)
private String content;
+ @ApiModelProperty(value = "鏈�浣庝环" )
+ @TableField(exist = false)
+ private BigDecimal minPrice;
+
@ApiModelProperty(value = "绀惧尯灏侀潰鍥�")
@TableField(exist = false)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java
index 7bf1095..d8a2b0f 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java
@@ -55,7 +55,7 @@
private String phone;
@ApiModelProperty(value = "鏄惁瀹屾垚棣栧崟锛�0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="瀹屾垚鏋佺" ,index =4,width = 10,valueMapping = "0=宸叉敞鍐�;1=瀹屾垚棣栧崟;")
+ @ExcelColumn(name="瀹屾垚闃舵" ,index =4,width = 10,valueMapping = "0=宸叉敞鍐�;1=瀹屾垚棣栧崟;")
private Integer firstOrderStatus;
@ApiModelProperty(value = "瀹屾垚棣栧崟鏃堕棿")
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/NoticeCardDTO.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/NoticeCardDTO.java
index f15497e..d6b9d7b 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/NoticeCardDTO.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/NoticeCardDTO.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "瀵硅薄缂栫爜", example = "1")
private Integer objId;
- @ApiModelProperty(value = "瀵硅薄绫诲瀷 0鍟嗗煄璁㈠崟 1绉垎娴佹按 2浜掑姩璇勪环 3浼樻儬鍒� 4鐜伴噾娴佹按", example = "1")
+ @ApiModelProperty(value = "瀵硅薄绫诲瀷 0鍟嗗煄璁㈠崟 1绉垎娴佹按 2浼樻儬鍒稿彂鏀� 3杩囨湡鎻愰啋 4绀惧尯娑堟伅", example = "1")
private Integer objType;
@ApiModelProperty(value = "娑堟伅绫诲瀷 0璁㈠崟閫氱煡 1绯荤粺娑堟伅 2浜掑姩娑堟伅 3浼樻儬鍒告彁閱� 4瀹樻柟瀹㈡湇 5娲诲姩鎺ㄨ崘 6鎴戠殑鍏虫敞", example = "1")
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CollectServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CollectServiceImpl.java
index 103ec90..9a9a3de 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CollectServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CollectServiceImpl.java
@@ -234,8 +234,8 @@
.selectAs(Goods::getName,Collect::getName)
.selectAs(Goods::getPrice,Collect::getPrice)
.selectAs(Goods::getImgurl,Collect::getActivityImgurl)
- .select(" ifnull(( select min(gs.PRICE) from goods_sku gs where gs.GOODS_ID = t1.id and gs.ISDELETED = 0 ),0) ",Goods::getMinPrice)
- .select(" ifnull(( select min(gs.SHOW_PRICE) from goods_sku gs where gs.GOODS_ID = t1.id and gs.ISDELETED = 0 ),0) ",Goods::getLinePrice)
+ .select(" ifnull(( select min(gs.PRICE) from goods_sku gs where gs.GOODS_ID = t1.id and gs.ISDELETED = 0 ),0) ",Collect::getMinPrice)
+ .select(" ifnull(( select min(gs.SHOW_PRICE) from goods_sku gs where gs.GOODS_ID = t1.id and gs.ISDELETED = 0 ),0) ",Collect::getLinePrice)
.leftJoin(Goods.class,Goods::getId,Collect::getObjId)
.eq(Collect::getIsdeleted,Constants.ZERO)
.eq(Collect::getMemberId,memberId)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java
index e9f20e7..f29d2fb 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java
@@ -275,6 +275,7 @@
Utils.MP.blankToNull(pageWrap.getModel());
replyWrapper.selectAs(Comment::getId,ActivityReplyCommentDTO::getId);
replyWrapper.selectAs(Comment::getReplyId,ActivityReplyCommentDTO::getReplyId);
+ replyWrapper.selectAs(Comment::getIsdeleted,ActivityReplyCommentDTO::getIsdeleted);
if(Objects.isNull(pageWrap.getModel().getMemberId())){
replyWrapper.select(" 0 ",ActivityReplyCommentDTO::getZanStatus);
}else{
@@ -331,8 +332,12 @@
if(Objects.nonNull(replyCommentDTO)){
ZanDTO replyZan = MapUtils.getObject(count, replyCommentDTO.getId());
replyCommentDTO.setZanCount(replyZan != null ? replyZan.getCount() : 0);
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
- replyCommentDTO.setMultifileList(multifileList.stream().filter(t -> t.getObjId().equals(replyCommentDTO.getId())).collect(Collectors.toList()));
+ if(Constants.equalsInteger(replyCommentDTO.getIsdeleted(),Constants.ONE)){
+ replyCommentDTO.setContent("璇ヨ瘎璁哄凡琚師浣滆�呭垹闄�");
+ }else{
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ replyCommentDTO.setMultifileList(multifileList.stream().filter(t -> t.getObjId().equals(replyCommentDTO.getId())).collect(Collectors.toList()));
+ }
}
replyCommentDTO.setMemberImgUrl(StringUtils.isNotBlank(replyCommentDTO.getMemberImgUrl())?memberFile+replyCommentDTO.getMemberImgUrl():null);
s.setActivityReplyCommentDTO(replyCommentDTO);
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 94fa98b..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
@@ -1001,7 +1001,4 @@
}
-
-
-
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java
index 262523f..7f05cc3 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java
@@ -292,6 +292,7 @@
.le(pageWrap.getModel().getEndtime() != null,WithdrawRecord::getCreateDate, pageWrap.getModel().getEndtime())
.like(pageWrap.getModel().getShopName() != null,Shop::getName, pageWrap.getModel().getShopName())
.eq(WithdrawRecord::getIsdeleted,Constants.ZERO)
+ .in(WithdrawRecord::getStatus,Constants.ZERO,Constants.ONE)
.eq(pageWrap.getModel().getStatus()!=null,WithdrawRecord::getStatus,pageWrap.getModel().getStatus())
);
if(count == null){
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index 55655d6..8a82b5a 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -126,11 +126,11 @@
@Override
public PageData<SystemUserListVO> findPage(PageWrap<QuerySystemUserDTO> pageWrap) {
// 鏍归儴闂ㄦ潯浠跺鐞嗭紙闇�鏌ヨ鏍归儴闂ㄤ笅鎵�鏈夐儴闂ㄧ殑鐢ㄦ埛锛�
- if (pageWrap.getModel().getRootDeptId() != null) {
- pageWrap.getModel().setDepartmentIds(getAllowedDeptIds(pageWrap.getModel().getRootDeptId()));
- } else {
- pageWrap.getModel().setDepartmentIds(getAllowedDeptIds(null));
- }
+// if (pageWrap.getModel().getRootDeptId() != null) {
+// pageWrap.getModel().setDepartmentIds(getAllowedDeptIds(pageWrap.getModel().getRootDeptId()));
+// } else {
+// pageWrap.getModel().setDepartmentIds(getAllowedDeptIds(null));
+// }
// 鎵ц鏌ヨ
PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
List<SystemUserListVO> userList = systemUserMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause());
diff --git a/server/dmmall_service/src/main/resources/application-pro.yml b/server/dmmall_service/src/main/resources/application-pro.yml
index 1d20b48..a101968 100644
--- a/server/dmmall_service/src/main/resources/application-pro.yml
+++ b/server/dmmall_service/src/main/resources/application-pro.yml
@@ -50,10 +50,10 @@
wx:
pay:
appId: wx0115b948d647e9b2
- appSecret: 3462fa186da7cb06c544df8d8664b63a
- mchId: 1229817002
+ appSecret: 4b5b97d6770f1fc6b09a7019804739a7 #3462fa186da7cb06c544df8d8664b63a
+ mchId: 1739990831
mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
- notifyUrl: https://mall.myshopify.com/dmmall_interface/web/api/wxPayNotify
+ notifyUrl: https://dynj.ahapp.net/dmmall_interface/web/api/wxPayNotify #mall.myshopify.com
keyPath: /usr/local/jars/apiclient_cert.p12
tencent:
diff --git a/server/dmmall_web/src/main/resources/application.yml b/server/dmmall_web/src/main/resources/application.yml
index aa33e6b..36aee93 100644
--- a/server/dmmall_web/src/main/resources/application.yml
+++ b/server/dmmall_web/src/main/resources/application.yml
@@ -1,6 +1,6 @@
# 椤圭洰淇℃伅閰嶇疆
project:
- name: 绂忓埄鍟嗗煄
+ name: 榧庡厓鍐滄満
version: 1.0.0
env: development
# env: production
--
Gitblit v1.9.3