From 000c62b9a5b19197fcd93db6382841cedb0c4537 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 17 二月 2025 18:37:27 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java | 51 +---
server/services/src/main/java/com/doumee/service/business/impl/DiscountServiceImpl.java | 226 +++++++++++----------
server/services/src/main/java/com/doumee/dao/business/join/DiscountJoinMapper.java | 13 +
server/services/src/main/java/com/doumee/dao/business/web/request/GoodsorderBackDTO.java | 5
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 3
server/web/src/main/java/com/doumee/jtt808/web/controller/ExceptionController.java | 10
server/services/src/main/java/com/doumee/dao/business/join/DiscountMemberJoinMapper.java | 13 +
server/services/src/main/java/com/doumee/service/business/DiscountService.java | 2
server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java | 134 ++-----------
server/services/src/main/java/com/doumee/core/constants/Constants.java | 8
server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 6
server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java | 2
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 65 +++++-
server/services/src/main/java/com/doumee/dao/business/model/Discount.java | 12 +
14 files changed, 278 insertions(+), 272 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java b/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
index dda97c7..de885c8 100644
--- a/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
@@ -143,7 +143,7 @@
@PostMapping("/backGoodsorder")
@RequiresPermissions("business:goodsorder:query")
public ApiResponse backGoodsorder(@RequestBody GoodsorderBackDTO goodsorderBackDTO){
- goodsorderService.backGoodsorder(goodsorderBackDTO.getOrderId(),goodsorderBackDTO.getMoney(),goodsorderBackDTO.getReason());
+ goodsorderService.backGoodsorder(goodsorderBackDTO);
return ApiResponse.success(null);
}
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index 191e1c1..7de901b 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -39,6 +39,7 @@
public static final String PRIVATE_KEY = "PRIVATE_KEY";
public static final String PROJECT_FILE = "PROJECT_FILE";
public static final String PROJECTS = "PROJECTS";
+ public static final String DISCOUNT = "DISCOUNT";
public static final String FORCE_BACK_LOCK = "FORCE_BACK_LOCK";
public static final String FORCE_BACK_SITE = "FORCE_BACK_SITE";
//杞﹁締绫诲瀷鏁版嵁
@@ -50,6 +51,13 @@
public static String REPAIR = "REPAIR";
public static final String NOTICE_SITE_LINK_LIMIT="NOTICE_SITE_LINK_LIMIT";
+ public static boolean equalsInteger(Integer a, Integer b) {
+ if (formatIntegerNum(a) == formatIntegerNum(b)) {
+ return true;
+ }
+ return false;
+ }
+
public interface MqttTopic{
String topic_index = "device/lock/";
diff --git a/server/services/src/main/java/com/doumee/dao/business/join/DiscountJoinMapper.java b/server/services/src/main/java/com/doumee/dao/business/join/DiscountJoinMapper.java
new file mode 100644
index 0000000..30c31f9
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/join/DiscountJoinMapper.java
@@ -0,0 +1,13 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.Bikes;
+import com.doumee.dao.business.model.Discount;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author T14
+ */
+@Repository
+public interface DiscountJoinMapper extends MPJJoinMapper<Discount> {
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/join/DiscountMemberJoinMapper.java b/server/services/src/main/java/com/doumee/dao/business/join/DiscountMemberJoinMapper.java
new file mode 100644
index 0000000..97b3a6d
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/join/DiscountMemberJoinMapper.java
@@ -0,0 +1,13 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.Discount;
+import com.doumee.dao.business.model.DiscountMember;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author T14
+ */
+@Repository
+public interface DiscountMemberJoinMapper extends MPJJoinMapper<DiscountMember> {
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Discount.java b/server/services/src/main/java/com/doumee/dao/business/model/Discount.java
index 8ee8eef..68b7641 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Discount.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Discount.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -147,4 +148,15 @@
@ExcelColumn(name="鏄惁鏀寔鐢靛姩杞� 0涓嶆敮鎸� 1鏀寔")
private Integer iselecbike;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸插敭鏁伴噺", example = "1")
+ private Integer saleNum;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "閫傜敤椤圭洰锛�1=鑷杞︼紱2=鐢靛姩杞� (鏌ヨ浣跨敤)", example = "1")
+ private Integer bikeOrElec;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍥剧墖鍏ㄨ矾寰�", example = "1")
+ private String fullImgUrl;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java b/server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java
index b00dd03..b333480 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -22,141 +23,125 @@
public class DiscountMember {
@ApiModelProperty(value = "缂栫爜")
- @ExcelColumn(name="缂栫爜")
private String id;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
- @ExcelColumn(name="鍒涘缓浜�")
private String creator;
@ApiModelProperty(value = "缂栬緫鏃堕棿")
- @ExcelColumn(name="缂栬緫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
- @ExcelColumn(name="缂栬緫浜�")
private String editor;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
- @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String info;
@ApiModelProperty(value = "绁ㄥ彿")
- @ExcelColumn(name="绁ㄥ彿")
+ @ExcelColumn(name="濂楅绁ㄥ彿",index = 0,width = 16)
private String code;
@ApiModelProperty(value = "鍚嶇О")
- @ExcelColumn(name="鍚嶇О")
+ @ExcelColumn(name="濂楅鍚嶇О",index = 2,width = 10)
private String name;
@ApiModelProperty(value = "绫诲瀷 0鏈熼檺鍗� 1娆″崱", example = "1")
- @ExcelColumn(name="绫诲瀷 0鏈熼檺鍗� 1娆″崱")
+ @ExcelColumn(name="濂楅绫诲瀷",index = 1,valueMapping = "0=鏈熼檺鍗★紱1=娆″崱锛�",width = 10)
private Integer type;
@ApiModelProperty(value = "姣忔棩楠戣闄愬埗绫诲瀷 0涓嶉檺鍒� 1闄愬埗", example = "1")
- @ExcelColumn(name="姣忔棩楠戣闄愬埗绫诲瀷 0涓嶉檺鍒� 1闄愬埗")
private Integer limitType;
@ApiModelProperty(value = "姣忔棩楠戣闄愬埗鏃堕棿锛堝垎閽燂級", example = "1")
- @ExcelColumn(name="姣忔棩楠戣闄愬埗鏃堕棿锛堝垎閽燂級")
private Integer limitTime;
@ApiModelProperty(value = "閿�鍞环锛堝厓锛�", example = "1")
- @ExcelColumn(name="閿�鍞环锛堝厓锛�")
private BigDecimal price;
@ApiModelProperty(value = "鍒掔嚎浠凤紙鍏冿級", example = "1")
- @ExcelColumn(name="鍒掔嚎浠凤紙鍏冿級")
private BigDecimal linePrice;
@ApiModelProperty(value = "閿�鍞笭閬� 0灏忕▼搴�", example = "1")
- @ExcelColumn(name="閿�鍞笭閬� 0灏忕▼搴�")
private Integer channel;
@ApiModelProperty(value = "濂楅鍥剧墖")
- @ExcelColumn(name="濂楅鍥剧墖")
private String imgurl;
@ApiModelProperty(value = "绠�浠�")
- @ExcelColumn(name="绠�浠�")
private String descs;
@ApiModelProperty(value = "鎻忚堪")
- @ExcelColumn(name="鎻忚堪")
private String content;
@ApiModelProperty(value = "閿�鍞紑濮嬫棩鏈�")
- @ExcelColumn(name="閿�鍞紑濮嬫棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "閿�鍞粨鏉熸棩鏈�")
- @ExcelColumn(name="閿�鍞粨鏉熸棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
@ApiModelProperty(value = "浣跨敤鏃堕棿绫诲瀷 0鍥哄畾鏃堕棿娈� 1璐拱鍚庣敓鏁� 2鎸囧畾鏃ユ湡鐢熸晥", example = "1")
- @ExcelColumn(name="浣跨敤鏃堕棿绫诲瀷 0鍥哄畾鏃堕棿娈� 1璐拱鍚庣敓鏁� 2鎸囧畾鏃ユ湡鐢熸晥")
private Integer useType;
@ApiModelProperty(value = "浣跨敤寮�濮嬫棩鏈�")
- @ExcelColumn(name="浣跨敤寮�濮嬫棩鏈�")
+ @ExcelColumn(name="鏈夋晥鏈熷紑濮�",index = 5,width = 16,dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date useStartDate;
@ApiModelProperty(value = "浣跨敤缁撴潫鏃ユ湡")
- @ExcelColumn(name="浣跨敤缁撴潫鏃ユ湡")
+ @ExcelColumn(name="鏈夋晥鏈熺粨鏉�",index = 6,width = 16,dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date useEndDate;
@ApiModelProperty(value = "浣跨敤鏈夋晥澶╂暟", example = "1")
- @ExcelColumn(name="浣跨敤鏈夋晥澶╂暟")
private Integer useDays;
@ApiModelProperty(value = "鑺傚亣鏃ユ槸鍚﹀彲浠� 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鑺傚亣鏃ユ槸鍚﹀彲浠� 0鍚� 1鏄�")
private Integer useHoliday;
@ApiModelProperty(value = "宸ヤ綔鏃ユ槸鍚﹀彲浠� 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="宸ヤ綔鏃ユ槸鍚﹀彲浠� 0鍚� 1鏄�")
private Integer useWorkday;
@ApiModelProperty(value = "閿�閲忔�婚檺棰�", example = "1")
- @ExcelColumn(name="閿�閲忔�婚檺棰�")
private Integer saleLimit;
@ApiModelProperty(value = "閿�閲忔瘡澶╅檺棰�", example = "1")
- @ExcelColumn(name="閿�閲忔瘡澶╅檺棰�")
private Integer saleDayLimit;
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1浣滃簾 2杩囨湡鎴栫敤瀹�", example = "1")
- @ExcelColumn(name="鐘舵�� 0姝ｅ父 1浣滃簾 2杩囨湡鎴栫敤瀹�")
+ @ExcelColumn(name="濂楅鐘舵��",index = 7,width = 10,valueMapping = "0=姝ｅ父锛�1=浣滃簾锛�2=杩囨湡鎴栫敤瀹�")
private Integer status;
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember)")
- @ExcelColumn(name="鐢ㄦ埛缂栫爜锛堝叧鑱攎ember)")
private String memberId;
@ApiModelProperty(value = "鍏宠仈璁㈠崟缂栫爜(鍏宠仈goodsorder锛�")
- @ExcelColumn(name="鍏宠仈璁㈠崟缂栫爜(鍏宠仈goodsorder锛�")
private String goodsorderId;
@ApiModelProperty(value = "鏄惁鏀寔鑷杞﹁鍗� 0涓嶆敮鎸� 1鏀寔", example = "1")
- @ExcelColumn(name="鏄惁鏀寔鑷杞﹁鍗� 0涓嶆敮鎸� 1鏀寔")
private Integer isbike;
@ApiModelProperty(value = "鏄惁鏀寔鐢靛姩杞� 0涓嶆敮鎸� 1鏀寔", example = "1")
- @ExcelColumn(name="鏄惁鏀寔鐢靛姩杞� 0涓嶆敮鎸� 1鏀寔")
private Integer iselecbike;
+
+ @ApiModelProperty(value = "鐢ㄦ埛opneid")
+ @ExcelColumn(name="鐢ㄦ埛淇℃伅",index = 3,width = 20)
+ @TableField(exist = false)
+ private String openid;
+
+
+ @ApiModelProperty(value = "浣跨敤娆℃暟")
+ @ExcelColumn(name="浣跨敤娆℃暟",index = 4,width = 20)
+ @TableField(exist = false)
+ private Integer useTimes;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java b/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
index d325187..0034c79 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -135,4 +135,10 @@
@ApiModelProperty(value = "鏄惁缁撶畻 0 鏈粨绠� 1宸茬粨绠�")
@TableField(exist = false)
private Integer closeStatus;
+
+
+ @ApiModelProperty(value = "濂楅鍚嶇О", example = "2023-10-01 15:12:01")
+ @TableField(exist = false)
+ private String discountName;
+
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/GoodsorderBackDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/request/GoodsorderBackDTO.java
index 18a6350..4322d84 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/request/GoodsorderBackDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/request/GoodsorderBackDTO.java
@@ -21,4 +21,9 @@
@ApiModelProperty(value = "閫�娆鹃噾棰�")
private String reason;
+
+ @ApiModelProperty(value = "濂楅鍗￠��娆剧被鍨� 0閫�璐ч��娆� 1浠呴��娆�")
+ private Integer backType;
+
+
}
diff --git a/server/services/src/main/java/com/doumee/service/business/DiscountService.java b/server/services/src/main/java/com/doumee/service/business/DiscountService.java
index 7850adc..61b5690 100644
--- a/server/services/src/main/java/com/doumee/service/business/DiscountService.java
+++ b/server/services/src/main/java/com/doumee/service/business/DiscountService.java
@@ -94,4 +94,6 @@
* @return long
*/
long count(Discount discount);
+
+ void updStatus(Discount discount);
}
diff --git a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
index 5ea76b3..d2b4746 100644
--- a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
+++ b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
@@ -8,6 +8,7 @@
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
+import com.doumee.dao.business.web.request.GoodsorderBackDTO;
import com.doumee.dao.business.web.request.GoodsorderCanBanlanceDTO;
import com.doumee.dao.business.web.response.HomeResponse;
import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
@@ -153,7 +154,7 @@
* 閫�娆�
* @param orderId
*/
- void backGoodsorder(String orderId, BigDecimal money ,String reason);
+ void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO);
/**
* 鑾峰彇鍙��娆句俊鎭�
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java
index 135d83f..a67d18e 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java
@@ -4,17 +4,24 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.DiscountMemberMapper;
+import com.doumee.dao.business.join.DiscountMemberJoinMapper;
+import com.doumee.dao.business.model.Discount;
import com.doumee.dao.business.model.DiscountMember;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.DiscountMemberService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 鐢ㄦ埛楠戣濂楅鍗″叧鑱旇〃Service瀹炵幇
@@ -26,6 +33,9 @@
@Autowired
private DiscountMemberMapper discountMemberMapper;
+
+ @Autowired
+ private DiscountMemberJoinMapper discountMemberJoinMapper;
@Override
public String create(DiscountMember discountMember) {
@@ -87,121 +97,17 @@
@Override
public PageData<DiscountMember> findPage(PageWrap<DiscountMember> pageWrap) {
IPage<DiscountMember> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<DiscountMember> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<DiscountMember> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(DiscountMember::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(DiscountMember::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(DiscountMember::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(DiscountMember::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(DiscountMember::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(DiscountMember::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(DiscountMember::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(DiscountMember::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(DiscountMember::getInfo, pageWrap.getModel().getInfo());
- }
- if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(DiscountMember::getCode, pageWrap.getModel().getCode());
- }
- if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(DiscountMember::getName, pageWrap.getModel().getName());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(DiscountMember::getType, pageWrap.getModel().getType());
- }
- if (pageWrap.getModel().getLimitType() != null) {
- queryWrapper.lambda().eq(DiscountMember::getLimitType, pageWrap.getModel().getLimitType());
- }
- if (pageWrap.getModel().getLimitTime() != null) {
- queryWrapper.lambda().eq(DiscountMember::getLimitTime, pageWrap.getModel().getLimitTime());
- }
- if (pageWrap.getModel().getPrice() != null) {
- queryWrapper.lambda().eq(DiscountMember::getPrice, pageWrap.getModel().getPrice());
- }
- if (pageWrap.getModel().getLinePrice() != null) {
- queryWrapper.lambda().eq(DiscountMember::getLinePrice, pageWrap.getModel().getLinePrice());
- }
- if (pageWrap.getModel().getChannel() != null) {
- queryWrapper.lambda().eq(DiscountMember::getChannel, pageWrap.getModel().getChannel());
- }
- if (pageWrap.getModel().getImgurl() != null) {
- queryWrapper.lambda().eq(DiscountMember::getImgurl, pageWrap.getModel().getImgurl());
- }
- if (pageWrap.getModel().getDescs() != null) {
- queryWrapper.lambda().eq(DiscountMember::getDescs, pageWrap.getModel().getDescs());
- }
- if (pageWrap.getModel().getContent() != null) {
- queryWrapper.lambda().eq(DiscountMember::getContent, pageWrap.getModel().getContent());
- }
- if (pageWrap.getModel().getStartDate() != null) {
- queryWrapper.lambda().ge(DiscountMember::getStartDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()));
- queryWrapper.lambda().le(DiscountMember::getStartDate, Utils.Date.getEnd(pageWrap.getModel().getStartDate()));
- }
- if (pageWrap.getModel().getEndDate() != null) {
- queryWrapper.lambda().ge(DiscountMember::getEndDate, Utils.Date.getStart(pageWrap.getModel().getEndDate()));
- queryWrapper.lambda().le(DiscountMember::getEndDate, Utils.Date.getEnd(pageWrap.getModel().getEndDate()));
- }
- if (pageWrap.getModel().getUseType() != null) {
- queryWrapper.lambda().eq(DiscountMember::getUseType, pageWrap.getModel().getUseType());
- }
- if (pageWrap.getModel().getUseStartDate() != null) {
- queryWrapper.lambda().ge(DiscountMember::getUseStartDate, Utils.Date.getStart(pageWrap.getModel().getUseStartDate()));
- queryWrapper.lambda().le(DiscountMember::getUseStartDate, Utils.Date.getEnd(pageWrap.getModel().getUseStartDate()));
- }
- if (pageWrap.getModel().getUseEndDate() != null) {
- queryWrapper.lambda().ge(DiscountMember::getUseEndDate, Utils.Date.getStart(pageWrap.getModel().getUseEndDate()));
- queryWrapper.lambda().le(DiscountMember::getUseEndDate, Utils.Date.getEnd(pageWrap.getModel().getUseEndDate()));
- }
- if (pageWrap.getModel().getUseDays() != null) {
- queryWrapper.lambda().eq(DiscountMember::getUseDays, pageWrap.getModel().getUseDays());
- }
- if (pageWrap.getModel().getUseHoliday() != null) {
- queryWrapper.lambda().eq(DiscountMember::getUseHoliday, pageWrap.getModel().getUseHoliday());
- }
- if (pageWrap.getModel().getUseWorkday() != null) {
- queryWrapper.lambda().eq(DiscountMember::getUseWorkday, pageWrap.getModel().getUseWorkday());
- }
- if (pageWrap.getModel().getSaleLimit() != null) {
- queryWrapper.lambda().eq(DiscountMember::getSaleLimit, pageWrap.getModel().getSaleLimit());
- }
- if (pageWrap.getModel().getSaleDayLimit() != null) {
- queryWrapper.lambda().eq(DiscountMember::getSaleDayLimit, pageWrap.getModel().getSaleDayLimit());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(DiscountMember::getStatus, pageWrap.getModel().getStatus());
- }
- if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(DiscountMember::getMemberId, pageWrap.getModel().getMemberId());
- }
- if (pageWrap.getModel().getGoodsorderId() != null) {
- queryWrapper.lambda().eq(DiscountMember::getGoodsorderId, pageWrap.getModel().getGoodsorderId());
- }
- if (pageWrap.getModel().getIsbike() != null) {
- queryWrapper.lambda().eq(DiscountMember::getIsbike, pageWrap.getModel().getIsbike());
- }
- if (pageWrap.getModel().getIselecbike() != null) {
- queryWrapper.lambda().eq(DiscountMember::getIselecbike, pageWrap.getModel().getIselecbike());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(discountMemberMapper.selectPage(page, queryWrapper));
+ DiscountMember model = pageWrap.getModel();
+ queryWrapper.selectAll(DiscountMember.class)
+ .leftJoin(Member.class,Member::getId,DiscountMember::getMemberId)
+ .like(StringUtils.isNotBlank(model.getCode()),DiscountMember::getCode,model.getCode())
+ .like(StringUtils.isNotBlank(model.getName()),DiscountMember::getName,model.getName())
+ .like(StringUtils.isNotBlank(model.getOpenid()),Member::getOpenid,model.getOpenid())
+ .eq(Objects.nonNull(model.getStatus()),DiscountMember::getStatus,model.getStatus())
+ .orderByDesc(DiscountMember::getId);
+ return PageData.from(discountMemberJoinMapper.selectJoinPage(page, DiscountMember.class,queryWrapper));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/DiscountServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/DiscountServiceImpl.java
index 6f8073b..1a049aa 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/DiscountServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/DiscountServiceImpl.java
@@ -1,20 +1,37 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.constants.Constants;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.DiscountMapper;
+import com.doumee.dao.business.join.BikeRepairJoinMapper;
+import com.doumee.dao.business.join.DiscountJoinMapper;
+import com.doumee.dao.business.model.BaseParam;
+import com.doumee.dao.business.model.BikeRepair;
import com.doumee.dao.business.model.Discount;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.web.request.BikeRepairDTO;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.DiscountService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 楠戣濂楅淇℃伅琛⊿ervice瀹炵幇
@@ -27,16 +44,90 @@
@Autowired
private DiscountMapper discountMapper;
+ @Autowired
+ private DiscountJoinMapper discountJoinMapper;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
@Override
public String create(Discount discount) {
+ LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ this.vaildReq(discount);
+ discount.setStatus(Constants.ZERO);
+ discount.setIsdeleted(Constants.ZERO);
+ discount.setCreateDate(new Date());
+ discount.setCreator(userInfo.getId());
discountMapper.insert(discount);
return discount.getId();
}
+
+ public void vaildReq(Discount discount) {
+ if(Objects.isNull(discount)
+ || StringUtils.isBlank(discount.getName())
+ || Objects.isNull(discount.getType())
+ || Objects.isNull(discount.getLimitType())
+ || (discount.getLimitTime()==Constants.ONE && Objects.isNull(discount.getLimitTime()))
+ || Objects.isNull(discount.getPrice())
+ || Objects.isNull(discount.getChannel())
+ || Objects.isNull(discount.getStartDate())
+ || Objects.isNull(discount.getEndDate())
+ || Objects.isNull(discount.getUseType())
+ || (discount.getUseType()==Constants.ZERO && ( Objects.isNull(discount.getUseStartDate()) || Objects.isNull(discount.getUseEndDate()) ))
+ || (discount.getUseType()==Constants.ONE && Objects.isNull(discount.getUseDays()))
+ || (discount.getUseType()==Constants.TWO && ( Objects.isNull(discount.getUseStartDate()) || Objects.isNull(discount.getUseDays()) ))
+ || (Objects.isNull(discount.getUseHoliday()) || Objects.isNull(discount.getUseWorkday()) )
+ || (Objects.isNull(discount.getIsbike()) || Objects.isNull(discount.getIselecbike()) )
+ ){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR);
+ }
+ if(discount.getStartDate().getTime()>discount.getEndDate().getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"閿�鍞椂娈典俊鎭敊璇�");
+ }
+ //鍥哄畾鏃ユ湡鐢熸晥
+ if(discount.getUseType()==Constants.ZERO &&
+ ( discount.getUseStartDate().getTime()>discount.getUseEndDate().getTime() ||
+ discount.getUseStartDate().getTime() < discount.getStartDate().getTime() ||
+ discount.getUseEndDate().getTime() > discount.getEndDate().getTime()
+ ) ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浣跨敤鏃舵淇℃伅閿欒");
+ }
+ //鎸囧畾鏃ユ湡鐢熸晥
+ if(discount.getUseType()==Constants.TWO &&
+ ( discount.getUseStartDate().getTime()<discount.getStartDate().getTime() ||
+ discount.getUseStartDate().getTime() > discount.getEndDate().getTime()
+ ) ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浣跨敤鏃舵淇℃伅閿欒");
+ }
+ }
+
+
@Override
public void deleteById(String id) {
- discountMapper.deleteById(id);
+ Discount discount = discountMapper.selectById(id);
+ if(Objects.isNull(discount)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(Constants.equalsInteger(discount.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炵鐢ㄦ暟鎹�,鏃犳硶杩涜鍒犻櫎");
+ }
+ discountMapper.update(null,new UpdateWrapper<Discount>().lambda().set(Discount::getIsdeleted,Constants.ONE).eq(Discount::getId,discount.getId()));
}
+
+
+ @Override
+ public void updStatus(Discount discount) {
+ if(Objects.isNull(discount)
+ || StringUtils.isBlank(discount.getId())
+ || Objects.isNull(discount.getStatus())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ discountMapper.update(null,new UpdateWrapper<Discount>().lambda().set(Discount::getStatus,discount.getStatus()).eq(Discount::getId,discount.getId()));
+ }
+
+
+
@Override
public void delete(Discount discount) {
@@ -69,7 +160,20 @@
@Override
public Discount findById(String id) {
- return discountMapper.selectById(id);
+ Discount discount = discountJoinMapper.selectOne(new MPJLambdaWrapper<Discount>()
+ .select(" (select count(1) from goodsorder g where g.obj_type = 0 and g.obj_id = t.id and g.pay_status = 1 ) ",Discount::getSaleNum)
+ .leftJoin(SystemUser.class,SystemUser::getId,Discount::getCreator)
+ .eq(Discount::getId,id)
+ );
+ if(Objects.isNull(discount)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(StringUtils.isNotBlank(discount.getImgurl())){
+ String path =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode()+
+ systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.DISCOUNT).getCode();
+ discount.setFullImgUrl(path + discount.getImgurl());
+ }
+ return discount;
}
@Override
@@ -87,112 +191,20 @@
@Override
public PageData<Discount> findPage(PageWrap<Discount> pageWrap) {
IPage<Discount> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<Discount> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<Discount> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(Discount::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(Discount::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(Discount::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(Discount::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(Discount::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(Discount::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(Discount::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(Discount::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(Discount::getInfo, pageWrap.getModel().getInfo());
- }
- if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Discount::getName, pageWrap.getModel().getName());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(Discount::getType, pageWrap.getModel().getType());
- }
- if (pageWrap.getModel().getLimitType() != null) {
- queryWrapper.lambda().eq(Discount::getLimitType, pageWrap.getModel().getLimitType());
- }
- if (pageWrap.getModel().getLimitTime() != null) {
- queryWrapper.lambda().eq(Discount::getLimitTime, pageWrap.getModel().getLimitTime());
- }
- if (pageWrap.getModel().getPrice() != null) {
- queryWrapper.lambda().eq(Discount::getPrice, pageWrap.getModel().getPrice());
- }
- if (pageWrap.getModel().getLinePrice() != null) {
- queryWrapper.lambda().eq(Discount::getLinePrice, pageWrap.getModel().getLinePrice());
- }
- if (pageWrap.getModel().getChannel() != null) {
- queryWrapper.lambda().eq(Discount::getChannel, pageWrap.getModel().getChannel());
- }
- if (pageWrap.getModel().getImgurl() != null) {
- queryWrapper.lambda().eq(Discount::getImgurl, pageWrap.getModel().getImgurl());
- }
- if (pageWrap.getModel().getDescs() != null) {
- queryWrapper.lambda().eq(Discount::getDescs, pageWrap.getModel().getDescs());
- }
- if (pageWrap.getModel().getContent() != null) {
- queryWrapper.lambda().eq(Discount::getContent, pageWrap.getModel().getContent());
- }
- if (pageWrap.getModel().getStartDate() != null) {
- queryWrapper.lambda().ge(Discount::getStartDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()));
- queryWrapper.lambda().le(Discount::getStartDate, Utils.Date.getEnd(pageWrap.getModel().getStartDate()));
- }
- if (pageWrap.getModel().getEndDate() != null) {
- queryWrapper.lambda().ge(Discount::getEndDate, Utils.Date.getStart(pageWrap.getModel().getEndDate()));
- queryWrapper.lambda().le(Discount::getEndDate, Utils.Date.getEnd(pageWrap.getModel().getEndDate()));
- }
- if (pageWrap.getModel().getUseType() != null) {
- queryWrapper.lambda().eq(Discount::getUseType, pageWrap.getModel().getUseType());
- }
- if (pageWrap.getModel().getUseStartDate() != null) {
- queryWrapper.lambda().ge(Discount::getUseStartDate, Utils.Date.getStart(pageWrap.getModel().getUseStartDate()));
- queryWrapper.lambda().le(Discount::getUseStartDate, Utils.Date.getEnd(pageWrap.getModel().getUseStartDate()));
- }
- if (pageWrap.getModel().getUseEndDate() != null) {
- queryWrapper.lambda().ge(Discount::getUseEndDate, Utils.Date.getStart(pageWrap.getModel().getUseEndDate()));
- queryWrapper.lambda().le(Discount::getUseEndDate, Utils.Date.getEnd(pageWrap.getModel().getUseEndDate()));
- }
- if (pageWrap.getModel().getUseDays() != null) {
- queryWrapper.lambda().eq(Discount::getUseDays, pageWrap.getModel().getUseDays());
- }
- if (pageWrap.getModel().getUseHoliday() != null) {
- queryWrapper.lambda().eq(Discount::getUseHoliday, pageWrap.getModel().getUseHoliday());
- }
- if (pageWrap.getModel().getUseWorkday() != null) {
- queryWrapper.lambda().eq(Discount::getUseWorkday, pageWrap.getModel().getUseWorkday());
- }
- if (pageWrap.getModel().getSaleLimit() != null) {
- queryWrapper.lambda().eq(Discount::getSaleLimit, pageWrap.getModel().getSaleLimit());
- }
- if (pageWrap.getModel().getSaleDayLimit() != null) {
- queryWrapper.lambda().eq(Discount::getSaleDayLimit, pageWrap.getModel().getSaleDayLimit());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(Discount::getStatus, pageWrap.getModel().getStatus());
- }
- if (pageWrap.getModel().getIsbike() != null) {
- queryWrapper.lambda().eq(Discount::getIsbike, pageWrap.getModel().getIsbike());
- }
- if (pageWrap.getModel().getIselecbike() != null) {
- queryWrapper.lambda().eq(Discount::getIselecbike, pageWrap.getModel().getIselecbike());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(discountMapper.selectPage(page, queryWrapper));
+ Discount modele = pageWrap.getModel();
+ queryWrapper.selectAll(Discount.class)
+ .select(" (select count(1) from goodsorder g where g.obj_type = 0 and g.obj_id = t.id and g.pay_status = 1 ) ",Discount::getSaleNum)
+ .leftJoin(SystemUser.class,SystemUser::getId,Discount::getCreator)
+ .like(StringUtils.isNotEmpty(pageWrap.getModel().getName()),Discount::getName,pageWrap.getModel().getName())
+ .eq(Objects.nonNull(modele.getStatus()),Discount::getStatus, modele.getStatus())
+ .eq(Objects.nonNull(modele.getBikeOrElec()) && Constants.equalsInteger(modele.getBikeOrElec(),Constants.ONE),Discount::getIsbike, Constants.ONE)
+ .eq(Objects.nonNull(modele.getBikeOrElec()) && Constants.equalsInteger(modele.getBikeOrElec(),Constants.TWO),Discount::getIselecbike, Constants.ONE)
+ .eq(Discount::getIsdeleted, Constants.ZERO)
+ .eq( pageWrap.getModel().getStatus() !=null,BikeRepair::getStatus,pageWrap.getModel().getStatus());
+ queryWrapper.orderByDesc(Discount::getCreateDate);
+ return PageData.from(discountJoinMapper.selectJoinPage(page, Discount.class,queryWrapper));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 9facadf..67e8f95 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -30,10 +30,7 @@
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
-import com.doumee.dao.business.web.request.BikeRepairDTO;
-import com.doumee.dao.business.web.request.GoodsorderCanBanlanceDTO;
-import com.doumee.dao.business.web.request.MemberRidesQuery;
-import com.doumee.dao.business.web.request.RefundDTO;
+import com.doumee.dao.business.web.request.*;
import com.doumee.dao.business.web.response.*;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
import com.doumee.dao.business.model.*;
@@ -78,6 +75,12 @@
@Autowired
private GoodsorderMapper goodsorderMapper;
+
+ @Autowired
+ private DiscountMemberMapper discountMemberMapper;
+
+ @Autowired
+ private DiscountLogMapper discountLogMapper;
@Autowired
GoodsorderJoinMapper goodsorderJoinMapper;
@@ -241,6 +244,8 @@
}
return PageData.from(goodsorderExportVOIPage);
}
+
+
@Override
public List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model){
model.setPayStatus(Constants.ONE); //鍙煡璇㈡敮浠樻垚鍔熺殑
@@ -288,7 +293,9 @@
MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Goodsorder.class);
queryWrapper.selectAs(Member::getOpenid, Goodsorder::getOpenid);
+ queryWrapper.selectAs(DiscountMember::getName, Goodsorder::getDiscountName);
queryWrapper.leftJoin(Member.class, Member::getId ,Goodsorder::getMemberId);
+ queryWrapper.leftJoin(DiscountMember.class, DiscountMember::getId ,Goodsorder::getObjId);
queryWrapper.select("(select max(r.done_date) from refund r where r.obj_id=t.id and r.status=2 ) as refund_date");
queryWrapper.select("(select sum(r.money) from refund r where r.obj_id=t.id and r.status=2) as refund_money");
//鏃堕棿娈电瓫閫�
@@ -317,6 +324,7 @@
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
queryWrapper.orderByDesc(Goodsorder::getPayDate);
+ queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Goodsorder::getType,pageWrap.getModel().getType());
queryWrapper.select("(select sum(er.discount_price) from member_rides er where er.ordre_id=t.id and er.isdeleted=0) as discountMoney," +
"(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date desc limit 1) as memberRidesStatus");
if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ZERO)){
@@ -325,6 +333,7 @@
if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ONE)){
queryWrapper.eq(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey());
}
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getDiscountName()),Goodsorder::getDiscountName,pageWrap.getModel().getDiscountName());
IPage<Goodsorder> goodsorderIPage = goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class, queryWrapper);
if (!CollectionUtils.isEmpty(goodsorderIPage.getRecords())){
goodsorderIPage.getRecords().forEach(s->{
@@ -336,6 +345,9 @@
}
return PageData.from(goodsorderIPage);
}
+
+
+
@Override
@@ -811,9 +823,16 @@
}
@Override
- public void backGoodsorder(String orderId, BigDecimal money,String reason) {
+ public void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO) {
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
+ if(Objects.isNull(goodsorderBackDTO)
+ || StringUtils.isBlank(goodsorderBackDTO.getOrderId())
+ || StringUtils.isBlank(goodsorderBackDTO.getReason())
+ || Objects.isNull(goodsorderBackDTO.getBackType())
+ || Objects.isNull(goodsorderBackDTO.getMoney())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Goodsorder goodsorder = goodsorderMapper.selectById(goodsorderBackDTO.getOrderId());
if(goodsorder == null){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璁㈠崟淇℃伅涓嶅瓨鍦紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
}
@@ -822,7 +841,7 @@
}
QueryWrapper<Refund> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(Refund::getObjId,orderId)
+ .eq(Refund::getObjId,goodsorderBackDTO.getOrderId())
.eq(Refund::getStatus,Constants.TWO)
.eq(Refund::getIsdeleted,Constants.ZERO) ;
wrapper.select("sum(money) as money").last(" limit 1");
@@ -830,18 +849,42 @@
BigDecimal refundMoney = total == null?new BigDecimal(0):Constants.formatDecimalNum(total.getMoney());
//鍙��鍓╀綑 鍗曚綅鍏�
BigDecimal canBalance =Constants.translateMoney(Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refundMoney));
- if(canBalance.compareTo(money) >= Constants.ZERO){
+ if(canBalance.compareTo(goodsorderBackDTO.getMoney()) >= Constants.ZERO){
RefundDTO refundDTO = new RefundDTO();
- refundDTO.setOrderId(orderId);
+ refundDTO.setOrderId(goodsorderBackDTO.getOrderId());
refundDTO.setCanBalance(canBalance.multiply(new BigDecimal(100)));
- refundDTO.setRefundAmount(money.multiply(new BigDecimal(100)));
+ refundDTO.setRefundAmount(goodsorderBackDTO.getMoney().multiply(new BigDecimal(100)));
refundDTO.setTotalAmount(goodsorder.getMoney());
refundDTO.setMemberId(goodsorder.getMemberId());
refundDTO.setCreator(principal.getId());
- refundDTO.setReason(reason);
+ refundDTO.setReason(goodsorderBackDTO.getReason());
refundDTO.setType(Constants.REFUND_TYPE.BACK.getKey());
+ //閫�璐ч��娆� 鏌ョ湅濂楅璁㈠崟鐘舵�� 鏇存柊璁㈠崟淇℃伅
+ if(Constants.equalsInteger(goodsorderBackDTO.getBackType(),Constants.ZERO)&&Constants.equalsInteger(goodsorder.getType(),Constants.ONE)){
+ DiscountMember discountMember = discountMemberMapper.selectById(goodsorder.getObjId());
+ if(Objects.isNull(discountMember)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌濂楅鍗′俊鎭�");
+ }
+ if(Constants.equalsInteger(discountMember.getStatus(),Constants.ZERO)){
+ discountMemberMapper.update(null,new UpdateWrapper<DiscountMember>().lambda()
+ .set(DiscountMember::getStatus,Constants.ONE)
+ .eq(DiscountMember::getId,discountMember.getId())
+ );
+ //鎿嶄綔鏃ュ織
+ DiscountLog discountLog = new DiscountLog();
+ discountLog.setIsdeleted(Constants.ZERO);
+ discountLog.setCreator(principal.getId());
+ discountLog.setCreateDate(new Date());
+ discountLog.setDiscountMemberId(discountMember.getId());
+ discountLog.setType(Constants.ONE);
+ discountLog.setEditInfo("閫�璐ч��鍗�");
+ discountLog.setGoodsorderId(goodsorderBackDTO.getOrderId());
+ discountLogMapper.insert(discountLog);
+ }
+ }
//鍙戣捣閫�娆剧敵璇�
wxMiniUtilService.wxRefund(refundDTO);
+
}else {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝閫�娆鹃噾棰濅笉鍏佽瓒呰繃"+canBalance+"鍏�");
}
diff --git a/server/web/src/main/java/com/doumee/jtt808/web/controller/ExceptionController.java b/server/web/src/main/java/com/doumee/jtt808/web/controller/ExceptionController.java
index 9aa26c5..4d2635b 100644
--- a/server/web/src/main/java/com/doumee/jtt808/web/controller/ExceptionController.java
+++ b/server/web/src/main/java/com/doumee/jtt808/web/controller/ExceptionController.java
@@ -29,11 +29,11 @@
private static final Pattern compile = Pattern.compile("'\\w*'");
- @ExceptionHandler(Exception.class)
- public APIResult<?> onException(Exception e) {
- log.error("绯荤粺寮傚父", e);
- return new APIResult<>(e);
- }
+// @ExceptionHandler(Exception.class)
+// public APIResult<?> onException(Exception e) {
+// log.error("绯荤粺寮傚父", e);
+// return new APIResult<>(e);
+// }
@ExceptionHandler(APIException.class)
public APIResult<?> onAPIException(APIException e) {
--
Gitblit v1.9.3