From fccdf247da81cc79ddcf78bf0fa2d6be920873d0 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期六, 07 十月 2023 16:14:10 +0800
Subject: [PATCH] #pgsql 订单模块
---
 server/services/src/main/java/com/doumee/dao/business/join/GoodsorderJoinMapper.java      |   12 +
 server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java               |  123 +++++++++++++
 server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java           |   92 ++++++++++
 server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java                |    2 
 server/services/src/main/java/com/doumee/dao/business/GoodsorderMapper.java               |   11 +
 server/services/src/main/java/com/doumee/service/business/GoodsorderService.java          |  101 +++++++++++
 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java |  130 ++++++++++++++
 server/services/db/business.base_param.permissions.sql                                    |   10 
 8 files changed, 475 insertions(+), 6 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
new file mode 100644
index 0000000..d0ffd07
--- /dev/null
+++ b/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
@@ -0,0 +1,92 @@
+package com.doumee.api.business;
+
+import com.doumee.core.annotation.excel.ExcelExporter;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.Goodsorder;
+import com.doumee.service.business.GoodsorderService;
+import com.doumee.service.business.GoodsorderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+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 姹熻箘韫�
+ * @date 2023/09/27 18:06
+ */
+@Api(tags = "璁㈠崟淇℃伅琛�")
+@RestController
+@RequestMapping("/business/goodsorder")
+public class GoodsorderController {
+
+
+    @Autowired
+    private GoodsorderService goodsorderService;
+
+
+    @PreventRepeat
+    @ApiOperation("鏂板缓")
+    @PostMapping("/create")
+    @RequiresPermissions("business:goodsorder:create")
+    public ApiResponse create(@RequestBody Goodsorder goodsorder) {
+        return ApiResponse.success(goodsorderService.create(goodsorder));
+    }
+
+    @ApiOperation("鏍规嵁ID鍒犻櫎")
+    @GetMapping("/delete/{id}")
+    @RequiresPermissions("business:goodsorder:delete")
+    public ApiResponse deleteById(@PathVariable String id) {
+        goodsorderService.deleteById(id);
+        return ApiResponse.success(null);
+    }
+
+    @ApiOperation("鎵归噺鍒犻櫎")
+    @GetMapping("/delete/batch")
+    @RequiresPermissions("business:goodsorder:delete")
+    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+        String [] idArray = ids.split(",");
+        List<String> idList = new ArrayList<>();
+        for (String id : idArray) {
+            idList.add(id);
+        }
+        goodsorderService.deleteByIdInBatch(idList);
+        return ApiResponse.success(null);
+    }
+
+    @ApiOperation("鏍规嵁ID淇敼")
+    @PostMapping("/updateById")
+    @RequiresPermissions("business:goodsorder:update")
+    public ApiResponse updateById(@RequestBody Goodsorder goodsorder) {
+        goodsorderService.updateById(goodsorder);
+        return ApiResponse.success(null);
+    }
+
+    @ApiOperation("鍒嗛〉鏌ヨ")
+    @PostMapping("/page")
+    @RequiresPermissions("business:goodsorder:query")
+    public ApiResponse<PageData<Goodsorder>> findPage (@RequestBody PageWrap<Goodsorder> pageWrap) {
+        return ApiResponse.success(goodsorderService.findPage(pageWrap));
+    }
+
+    @ApiOperation("瀵煎嚭Excel")
+    @PostMapping("/exportExcel")
+    @RequiresPermissions("business:goodsorder:exportExcel")
+    public void exportExcel (@RequestBody PageWrap<Goodsorder> pageWrap, HttpServletResponse response) {
+        ExcelExporter.build(Goodsorder.class).export(goodsorderService.findPage(pageWrap).getRecords(), "鑷杞︿俊鎭〃", response);
+    }
+
+    @ApiOperation("鏍规嵁ID鏌ヨ")
+    @GetMapping("/{id}")
+    @RequiresPermissions("business:goodsorder:query")
+    public ApiResponse findById(@PathVariable String id) {
+        return ApiResponse.success(goodsorderService.findById(id));
+    }
+}
diff --git a/server/services/db/business.base_param.permissions.sql b/server/services/db/business.base_param.permissions.sql
index 34cbae3..d5ee6ba 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, 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);
 
diff --git a/server/services/src/main/java/com/doumee/dao/business/GoodsorderMapper.java b/server/services/src/main/java/com/doumee/dao/business/GoodsorderMapper.java
new file mode 100644
index 0000000..6e4f7c5
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/GoodsorderMapper.java
@@ -0,0 +1,11 @@
+package com.doumee.dao.business;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.Goodsorder;
+
+/**
+ * @author T14
+ */
+public interface GoodsorderMapper extends BaseMapper<Goodsorder> {
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/join/GoodsorderJoinMapper.java b/server/services/src/main/java/com/doumee/dao/business/join/GoodsorderJoinMapper.java
new file mode 100644
index 0000000..98822a5
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/join/GoodsorderJoinMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.Goodsorder;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author T14
+ */
+@Repository
+public interface GoodsorderJoinMapper  extends MPJJoinMapper<Goodsorder> {
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java b/server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java
index 17bbb81..d0091cb 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java
@@ -17,7 +17,7 @@
  */
 @Data
 @ApiModel("绯荤粺鍩虹閰嶇疆琛�")
-@TableName("`base_param`")
+@TableName("base_param")
 public class BaseParam {
 
     @ApiModelProperty(value = "缂栫爜")
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
new file mode 100644
index 0000000..64be7d3
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -0,0 +1,123 @@
+package com.doumee.dao.business.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.doumee.core.annotation.excel.ExcelColumn;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 璁㈠崟淇℃伅琛�
+ * @author 姹熻箘韫�
+ * @date 2023/09/27 18:06
+ */
+@Data
+@ApiModel("璁㈠崟淇℃伅琛�")
+@TableName("\"goodsorder\"")
+public class Goodsorder {
+
+    @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="璁㈠崟缂栫爜")
+    private String code;
+
+    @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
+    @ExcelColumn(name="鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
+    private String memberId;
+
+    @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
+    @ExcelColumn(name="鐢ㄦ埛鍚嶇О锛堝叧鑱攎ember琛級")
+    @TableField(exist = false)
+    private String memberName;
+
+    @ApiModelProperty(value = "浜ゆ槗閲戦")
+    @ExcelColumn(name="浜ゆ槗閲戦")
+    private BigDecimal money;
+
+    @ApiModelProperty(value = "鐘舵�� 0寰呮敮浠� 1宸叉敮浠� 2宸插彇娑� 3鏀粯澶辫触 4宸茬粨绠�")
+    @ExcelColumn(name="鐘舵�� 0寰呮敮浠� 1宸叉敮浠� 2宸插彇娑� 3鏀粯澶辫触 4宸茬粨绠�")
+    private Integer status;
+
+    @ApiModelProperty(value = "浜ゆ槗棰勮鍗曞彿")
+    @ExcelColumn(name="浜ゆ槗棰勮鍗曞彿")
+    private String preOrderid;
+
+    @ApiModelProperty(value = "鍦ㄧ嚎浜ゆ槗鍗曞彿")
+    @ExcelColumn(name="鍦ㄧ嚎浜ゆ槗鍗曞彿")
+    private String onlineOrderid;
+
+    @ApiModelProperty(value = "鏀粯鐘舵�� 0寰呮敮浠� 1宸叉敮浠�")
+    @ExcelColumn(name="鏀粯鐘舵�� 0寰呮敮浠� 1宸叉敮浠�")
+    private Integer payStatus;
+
+    @ApiModelProperty(value = "鏀粯鏂瑰紡 0寰俊 1鏀粯瀹�")
+    @ExcelColumn(name="鏀粯鏂瑰紡 0寰俊 1鏀粯瀹�")
+    private String payWay;
+
+    @ApiModelProperty(value = "鏀粯鏃堕棿")
+    @ExcelColumn(name="鏀粯鏃堕棿")
+    private Date payDate;
+
+    @ApiModelProperty(value = "浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾")
+    @ExcelColumn(name="浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾")
+    private Integer type;
+
+    @ApiModelProperty(value = "缁撶畻閲戦(鍒嗭級")
+    @ExcelColumn(name="缁撶畻閲戦(鍒嗭級")
+    private BigDecimal closeMoney;
+
+    @ApiModelProperty(value = "缁撶畻閫�娆惧崟鍙�(鍏宠仈refund)")
+    @ExcelColumn(name="缁撶畻閫�娆惧崟鍙�(鍏宠仈refund)")
+    private String closeId;
+
+    @ApiModelProperty(value = "缁撶畻鏃堕棿")
+    @ExcelColumn(name="缁撶畻鏃堕棿")
+    private Date closeDate;
+
+    @ApiModelProperty(value = "缁撶畻澶囨敞")
+    @ExcelColumn(name="缁撶畻澶囨敞")
+    private String closeInfo;
+
+    @ApiModelProperty(value = "缁撶畻鎿嶄綔浜虹紪鐮侊紙鍏宠仈system_user)")
+    @ExcelColumn(name="缁撶畻鎿嶄綔浜虹紪鐮侊紙鍏宠仈system_user)")
+    private String closeUserId;
+
+    @ApiModelProperty(value = "缁撶畻绫诲瀷 0鑷姩缁撶畻 1骞冲彴浜哄伐缁撶畻 2绯荤粺鑷姩缁撶畻")
+    @ExcelColumn(name="缁撶畻绫诲瀷 0鑷姩缁撶畻 1骞冲彴浜哄伐缁撶畻 2绯荤粺鑷姩缁撶畻")
+    private Integer closeType;
+}
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
new file mode 100644
index 0000000..0fd4958
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
@@ -0,0 +1,101 @@
+package com.doumee.service.business;
+
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.Bikes;
+import com.doumee.dao.business.model.Goodsorder;
+
+import java.util.List;
+
+/**
+ * 璁㈠崟淇℃伅琛⊿ervice瀹氫箟
+ * @author 姹熻箘韫�
+ * @date 2023/09/27 18:06
+ */
+public interface GoodsorderService {
+
+
+    /**
+     * 鍒涘缓
+     *
+     * @param goodsorder 瀹炰綋瀵硅薄
+     * @return String
+     */
+    String create(Goodsorder goodsorder);
+
+    /**
+     * 涓婚敭鍒犻櫎
+     *
+     * @param id 涓婚敭
+     */
+    void deleteById(String id);
+
+    /**
+     * 鍒犻櫎
+     *
+     * @param goodsorder 瀹炰綋瀵硅薄
+     */
+    void delete(Goodsorder goodsorder);
+
+    /**
+     * 鎵归噺涓婚敭鍒犻櫎
+     *
+     * @param ids 涓婚敭闆�
+     */
+    void deleteByIdInBatch(List<String> ids);
+
+    /**
+     * 涓婚敭鏇存柊
+     *
+     * @param goodsorder 瀹炰綋瀵硅薄
+     */
+    void updateById(Goodsorder goodsorder);
+
+    /**
+     * 鎵归噺涓婚敭鏇存柊
+     *
+     * @param goodsorders 瀹炰綋闆�
+     */
+    void updateByIdInBatch(List<Goodsorder> goodsorders);
+
+    /**
+     * 涓婚敭鏌ヨ
+     *
+     * @param id 涓婚敭
+     * @return Goodsorder
+     */
+    Goodsorder findById(String id);
+
+    /**
+     * 鏉′欢鏌ヨ鍗曟潯璁板綍
+     *
+     * @param goodsorder 瀹炰綋瀵硅薄
+     * @return Goodsorder
+     */
+    Goodsorder findOne(Goodsorder goodsorder);
+
+    /**
+     * 鏉′欢鏌ヨ
+     *
+     * @param goodsorder 瀹炰綋瀵硅薄
+     * @return List<Goodsorder>
+     */
+    List<Goodsorder> findList(Goodsorder goodsorder);
+
+    /**
+     * 鍒嗛〉鏌ヨ
+     *
+     * @param pageWrap 鍒嗛〉瀵硅薄
+     * @return PageData<Goodsorder>
+     */
+    PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap);
+
+    /**
+     * 鏉′欢缁熻
+     *
+     * @param goodsorder 瀹炰綋瀵硅薄
+     * @return long
+     */
+    long count(Goodsorder goodsorder);
+}
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
new file mode 100644
index 0000000..1ec5fd0
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -0,0 +1,130 @@
+package com.doumee.service.business.impl;
+
+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.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.GoodsorderMapper;
+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.service.business.GoodsorderService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import java.util.List;
+
+@Service
+public class GoodsorderServiceImpl implements GoodsorderService {
+
+
+
+    @Autowired
+    private GoodsorderMapper goodsorderMapper;
+
+    @Autowired
+    GoodsorderJoinMapper goodsorderJoinMapper;
+
+    @Override
+    public String create(Goodsorder goodsorder) {
+        goodsorderMapper.insert(goodsorder);
+        return goodsorder.getId();
+    }
+
+    @Override
+    public void deleteById(String id) {
+        goodsorderMapper.deleteById(id);
+    }
+
+    @Override
+    public void delete(Goodsorder goodsorder) {
+        UpdateWrapper<Goodsorder> deleteWrapper = new UpdateWrapper<>(goodsorder);
+        goodsorderMapper.delete(deleteWrapper);
+    }
+
+    @Override
+    public void deleteByIdInBatch(List<String> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return;
+        }
+        goodsorderMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    public void updateById(Goodsorder goodsorder) {
+        goodsorderMapper.updateById(goodsorder);
+    }
+
+    @Override
+    public void updateByIdInBatch(List<Goodsorder> goodsorders) {
+        if (CollectionUtils.isEmpty(goodsorders)) {
+            return;
+        }
+        for (Goodsorder goodsorder: goodsorders) {
+            this.updateById(goodsorder);
+        }
+    }
+
+    @Override
+    public Goodsorder findById(String id) {
+        return goodsorderMapper.selectById(id);
+    }
+
+    @Override
+    public Goodsorder findOne(Goodsorder goodsorder) {
+        QueryWrapper<Goodsorder> wrapper = new QueryWrapper<>(goodsorder);
+        return goodsorderMapper.selectOne(wrapper);
+    }
+
+    @Override
+    public List<Goodsorder> findList(Goodsorder goodsorder) {
+        QueryWrapper<Goodsorder> wrapper = new QueryWrapper<>(goodsorder);
+        return goodsorderMapper.selectList(wrapper);
+    }
+
+    @Override
+    public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) {
+        IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+        MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
+        Utils.MP.blankToNull(pageWrap.getModel());
+
+
+        if (pageWrap.getModel().getCode() != null) {
+            queryWrapper.like(Goodsorder::getCode, pageWrap.getModel().getCode());
+        }
+
+        if (pageWrap.getModel().getStatus() != null) {
+            queryWrapper.eq(Goodsorder::getStatus, pageWrap.getModel().getStatus());
+        }
+
+
+        if (pageWrap.getModel().getOnlineOrderid() != null) {
+            queryWrapper.eq(Goodsorder::getOnlineOrderid, pageWrap.getModel().getOnlineOrderid());
+        }
+
+        if (pageWrap.getModel().getPayDate() != null) {
+            queryWrapper.ge(Goodsorder::getPayDate, Utils.Date.getStart(pageWrap.getModel().getPayDate()));
+            queryWrapper.le(Goodsorder::getPayDate, Utils.Date.getEnd(pageWrap.getModel().getPayDate()));
+        }
+
+        queryWrapper.orderByDesc(Goodsorder::getCreateDate);
+        queryWrapper.selectAll(Goodsorder.class)
+                    .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));
+    }
+
+    @Override
+    public long count(Goodsorder goodsorder) {
+        QueryWrapper<Goodsorder> wrapper = new QueryWrapper<>(goodsorder);
+        return goodsorderMapper.selectCount(wrapper);
+    }
+}
--
Gitblit v1.9.3