From 35b0b9d26bac17adbc22c419c5d95357611d359d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 08 十月 2023 09:59:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/dao/business/web/response/PayOrderDTO.java | 26 ++++++++
server/services/src/main/java/com/doumee/core/constants/Constants.java | 1
server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 4 +
server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java | 16 ++++-
server/services/src/main/java/com/doumee/dao/business/web/response/GoodsorderDetailDTO.java | 23 +++++++
server/services/src/main/java/com/doumee/dao/business/model/Refund.java | 2
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 17 +++++
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 67 +++++++++++++++++++++-
server/services/db/business.base_param.permissions.sql | 10 +-
server/services/src/main/java/com/doumee/dao/business/join/MemberRidesJoinMapper.java | 12 ++++
10 files changed, 166 insertions(+), 12 deletions(-)
diff --git a/server/services/db/business.base_param.permissions.sql b/server/services/db/business.base_param.permissions.sql
index d5ee6ba..c947d83 100644
--- a/server/services/db/business.base_param.permissions.sql
+++ b/server/services/db/business.base_param.permissions.sql
@@ -1,6 +1,6 @@
-INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:create', '鏂板缓绯荤粺鍩虹閰嶇疆琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
-INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:delete', '鍒犻櫎绯荤粺鍩虹閰嶇疆琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
-INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:update', '淇敼绯荤粺鍩虹閰嶇疆琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
-INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:query', '鏌ヨ绯荤粺鍩虹閰嶇疆琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
-INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:exportExcel', '瀵煎嚭绯荤粺鍩虹閰嶇疆琛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:create', '鏂板缓绯荤粺鍩虹閰嶇疆琛�', '', 0, 'd481dca5-7f09-49b2-a152-8dac1c2029df', CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:delete', '鍒犻櫎绯荤粺鍩虹閰嶇疆琛�', '', 0, 'd481dca5-7f09-49b2-a152-8dac1c2029df', CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:update', '淇敼绯荤粺鍩虹閰嶇疆琛�', '', 0, 'd481dca5-7f09-49b2-a152-8dac1c2029df', CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:query', '鏌ヨ绯荤粺鍩虹閰嶇疆琛�', '', 0, 'd481dca5-7f09-49b2-a152-8dac1c2029df', CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO SYSTEM_PERMISSION(CODE, NAME, REMARK, FIXED, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME, DELETED) VALUES ('business:baseparam:exportExcel', '瀵煎嚭绯荤粺鍩虹閰嶇疆琛�(Excel)', '', 0, 'd481dca5-7f09-49b2-a152-8dac1c2029df', CURRENT_TIMESTAMP, NULL, NULL, 0);
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 3bc8d32..2b89f14 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
@@ -99,6 +99,7 @@
public static final Integer ZERO = 0 ;
public static final Integer ONE = 1 ;
public static final Integer TWO = 2 ;
+ public static final Integer THREE = 3 ;
public static int formatIntegerNum(Integer num){
if(num == null){
diff --git a/server/services/src/main/java/com/doumee/dao/business/join/MemberRidesJoinMapper.java b/server/services/src/main/java/com/doumee/dao/business/join/MemberRidesJoinMapper.java
new file mode 100644
index 0000000..8837a7e
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/join/MemberRidesJoinMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.MemberRides;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author T14
+ */
+@Repository
+public interface MemberRidesJoinMapper extends MPJJoinMapper<MemberRides> {
+}
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 999fcfb..64dd2eb 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
@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -46,6 +47,7 @@
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
+ @TableLogic
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
@@ -87,7 +89,7 @@
@ApiModelProperty(value = "鏀粯鏂瑰紡 0寰俊 1鏀粯瀹�")
@ExcelColumn(name="鏀粯鏂瑰紡 0寰俊 1鏀粯瀹�")
- private String payWay;
+ private Integer payWay;
@ApiModelProperty(value = "鏀粯鏃堕棿")
@ExcelColumn(name="鏀粯鏃堕棿")
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
index 816c03d..427a040 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
@@ -1,11 +1,9 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.*;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
@@ -45,6 +43,7 @@
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
+ @TableLogic
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
@@ -54,6 +53,12 @@
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜")
@ExcelColumn(name="鐢ㄦ埛缂栫爜")
private String memberId;
+
+ @ApiModelProperty(value = "鐢ㄦ埛OpenId")
+ @ExcelColumn(name="鐢ㄦ埛OpenId")
+ @TableField(exist = false)
+ private String memberOpenid;
+
@ApiModelProperty(value = "杞﹁締缂栫爜")
@ExcelColumn(name="杞﹁締缂栫爜")
@@ -67,6 +72,11 @@
@ExcelColumn(name="杞﹁締绫诲瀷缂栫爜")
private String paramId;
+ @ApiModelProperty(value = "杞﹁締绫诲瀷鍚嶇О")
+ @ExcelColumn(name="杞﹁締绫诲瀷鍚嶇О")
+ @TableField(exist = false)
+ private String paramName;
+
@ApiModelProperty(value = "绉熻溅绔欑偣缂栫爜")
@ExcelColumn(name="绉熻溅绔欑偣缂栫爜")
private String rentSiteId;
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Refund.java b/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
index b241569..f19d889 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -45,6 +46,7 @@
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
+ @TableLogic
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/GoodsorderDetailDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/GoodsorderDetailDTO.java
new file mode 100644
index 0000000..287c915
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/GoodsorderDetailDTO.java
@@ -0,0 +1,23 @@
+package com.doumee.dao.business.web.response;
+
+import com.doumee.dao.business.model.MemberRides;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("璁㈠崟璇︽儏")
+public class GoodsorderDetailDTO {
+
+ @ApiModelProperty(value = "鏀粯鏄庣粏")
+ private List<PayOrderDTO> payOrderDTOList;
+
+ @ApiModelProperty(value = "楠戣璁板綍")
+ private List<MemberRides> memberRidesList;
+
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/PayOrderDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/PayOrderDTO.java
new file mode 100644
index 0000000..940dfed
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/PayOrderDTO.java
@@ -0,0 +1,26 @@
+package com.doumee.dao.business.web.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("浜ゆ槗鏄庣粏")
+public class PayOrderDTO {
+
+ private String orderCode;
+
+ private Integer payType;
+
+ private Integer refundType;
+
+ private BigDecimal money;
+
+ private Date payDate;
+
+}
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 0fd4958..05c955e 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
@@ -5,6 +5,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Goodsorder;
+import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
import java.util.List;
@@ -98,4 +99,20 @@
* @return long
*/
long count(Goodsorder goodsorder);
+
+
+ /**
+ * 鏌ヨ璁㈠崟璇︽儏
+ * @param id
+ * @return
+ */
+ GoodsorderDetailDTO getGoodsorderDetailDTO(String id);
+
+
+ /**
+ * 寮哄埗缁撶畻璁㈠崟
+ * @param id
+ * @return
+ */
+ Goodsorder closerGoodsorder(String id);
}
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 a7d1957..65d33fa 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
@@ -4,6 +4,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 com.doumee.core.constants.Constants;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
@@ -11,12 +12,18 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.GoodsorderMapper;
import com.doumee.dao.business.MemberRidesMapper;
+import com.doumee.dao.business.MemberRidesMapper;
+import com.doumee.dao.business.RefundMapper;
import com.doumee.dao.business.join.GoodsorderJoinMapper;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.web.response.HomeResponse;
+import com.doumee.dao.business.join.MemberRidesJoinMapper;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
+import com.doumee.dao.business.web.response.PayOrderDTO;
import com.doumee.service.business.GoodsorderService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
@@ -26,6 +33,8 @@
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
+
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -45,6 +54,15 @@
@Autowired
private MemberRidesMapper memberRidesMapper;
+
+
+
+
+ @Autowired
+ private RefundMapper refundMapper;
+
+ @Autowired
+ private MemberRidesJoinMapper memberRidesJoinMapper;
@Override
public String create(Goodsorder goodsorder) {
@@ -109,7 +127,6 @@
MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
-
if (pageWrap.getModel().getCode() != null) {
queryWrapper.like(Goodsorder::getCode, pageWrap.getModel().getCode());
}
@@ -117,7 +134,6 @@
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.eq(Goodsorder::getStatus, pageWrap.getModel().getStatus());
}
-
if (pageWrap.getModel().getOnlineOrderid() != null) {
queryWrapper.eq(Goodsorder::getOnlineOrderid, pageWrap.getModel().getOnlineOrderid());
@@ -133,7 +149,6 @@
.selectAs(Member::getName,Goodsorder::getMemberName)
.leftJoin(Member.class,Member::getId,Goodsorder::getMemberId)
.like(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()),Member::getName,pageWrap.getModel().getMemberName());
-
return PageData.from(goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class,queryWrapper));
}
@@ -176,4 +191,50 @@
+
+ @Override
+ public GoodsorderDetailDTO getGoodsorderDetailDTO(String id) {
+
+ List<PayOrderDTO> payOrderDTOList = new ArrayList<>();
+ Goodsorder goodsorder = goodsorderMapper.selectById(id);
+ QueryWrapper<Refund> refundQuery = new QueryWrapper<>();
+ refundQuery.lambda()
+ .eq(Refund::getObjId,id);
+ List<Refund> refunds = refundMapper.selectList(refundQuery);
+
+ PayOrderDTO payOrderDTO = new PayOrderDTO();
+ payOrderDTO.setOrderCode(goodsorder.getCode());
+ payOrderDTO.setPayType(goodsorder.getPayWay());
+ payOrderDTO.setMoney(goodsorder.getMoney());
+ payOrderDTO.setPayDate(goodsorder.getPayDate());
+ payOrderDTOList.add(0,payOrderDTO);
+ if (!CollectionUtils.isEmpty(refunds)){
+ refunds.forEach(s->{
+ PayOrderDTO refundOrderDTO = new PayOrderDTO();
+ refundOrderDTO.setOrderCode(s.getCode());
+ refundOrderDTO.setPayType(s.getPayWay());
+ refundOrderDTO.setMoney(s.getMoney());
+ refundOrderDTO.setPayDate(s.getDoneDate());
+ payOrderDTOList.add(refundOrderDTO);
+ });
+ }
+ MPJLambdaWrapper<MemberRides> wrapper = new MPJLambdaWrapper<>();
+ wrapper.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
+ .eq(BaseParam::getType, Constants.THREE);
+ List<MemberRides> memberRides = memberRidesJoinMapper.selectJoinList(MemberRides.class, wrapper);
+ GoodsorderDetailDTO goodsorderDetailDTO = new GoodsorderDetailDTO();
+ goodsorderDetailDTO.setPayOrderDTOList(payOrderDTOList);
+ goodsorderDetailDTO.setMemberRidesList(memberRides);
+ return goodsorderDetailDTO;
+ }
+
+ @Override
+ public Goodsorder closerGoodsorder(String id) {
+
+ Goodsorder goodsorder = goodsorderMapper.selectById(id);
+
+
+
+ return null;
+ }
}
--
Gitblit v1.9.3