Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/doumu/DoumuProductFiController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/doumu/DoumuProductFjController.java

@@ -6,8 +6,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,8 +14,8 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.DoumuProductFi;
-import com.ruoyi.system.service.IDoumuProductFiService;
+import com.ruoyi.system.domain.DoumuProductFj;
+import com.ruoyi.system.service.IDoumuProductFjService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -29,20 +27,20 @@ import com.ruoyi.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/system/fi")
-public class DoumuProductFiController extends BaseController
+public class DoumuProductFjController extends BaseController
 {
     @Autowired
-    private IDoumuProductFiService doumuProductFiService;
+    private IDoumuProductFjService DoumuProductFjService;
 
     /**
      * 查询痘姆古陶_附件列表
      */
     @PreAuthorize("@ss.hasPermi('system:fi:list')")
     @GetMapping("/list")
-    public TableDataInfo list(DoumuProductFi doumuProductFi)
+    public TableDataInfo list(DoumuProductFj doumuProductFj)
     {
         startPage();
-        List<DoumuProductFi> list = doumuProductFiService.selectDoumuProductFiList(doumuProductFi);
+        List<DoumuProductFj> list = DoumuProductFjService.selectDoumuProductFjList(doumuProductFj);
         return getDataTable(list);
     }
 
@@ -52,10 +50,10 @@ public class DoumuProductFiController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:fi:export')")
     @Log(title = "痘姆古陶_附件", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, DoumuProductFi doumuProductFi)
+    public void export(HttpServletResponse response, DoumuProductFj doumuProductFj)
     {
-        List<DoumuProductFi> list = doumuProductFiService.selectDoumuProductFiList(doumuProductFi);
-        ExcelUtil<DoumuProductFi> util = new ExcelUtil<DoumuProductFi>(DoumuProductFi.class);
+        List<DoumuProductFj> list = DoumuProductFjService.selectDoumuProductFjList(doumuProductFj);
+        ExcelUtil<DoumuProductFj> util = new ExcelUtil<DoumuProductFj>(DoumuProductFj.class);
         util.exportExcel(response, list, "痘姆古陶_附件数据");
     }
 
@@ -66,7 +64,7 @@ public class DoumuProductFiController extends BaseController
     @GetMapping(value = "/{fiId}")
     public AjaxResult getInfo(@PathVariable("fiId") Long fiId)
     {
-        return success(doumuProductFiService.selectDoumuProductFiByFiId(fiId));
+        return success(DoumuProductFjService.selectDoumuProductFjByFiId(fiId));
     }
 
     /**
@@ -75,9 +73,9 @@ public class DoumuProductFiController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:fi:add')")
     @Log(title = "痘姆古陶_附件", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody DoumuProductFi doumuProductFi)
+    public AjaxResult add(@RequestBody DoumuProductFj doumuProductFj)
     {
-        return toAjax(doumuProductFiService.insertDoumuProductFi(doumuProductFi));
+        return toAjax(DoumuProductFjService.insertDoumuProductFj(doumuProductFj));
     }
 
     /**
@@ -86,9 +84,9 @@ public class DoumuProductFiController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:fi:edit')")
     @Log(title = "痘姆古陶_附件", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
-    public AjaxResult edit(@RequestBody DoumuProductFi doumuProductFi)
+    public AjaxResult edit(@RequestBody DoumuProductFj doumuProductFj)
     {
-        return toAjax(doumuProductFiService.updateDoumuProductFi(doumuProductFi));
+        return toAjax(DoumuProductFjService.updateDoumuProductFj(doumuProductFj));
     }
 
     /**
@@ -99,6 +97,6 @@ public class DoumuProductFiController extends BaseController
 	@GetMapping("/delete/{fiIds}")
     public AjaxResult remove(@PathVariable Long[] fiIds)
     {
-        return toAjax(doumuProductFiService.deleteDoumuProductFiByFiIds(fiIds));
+        return toAjax(DoumuProductFjService.deleteDoumuProductFjByFiIds(fiIds));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/doumu/DoumuProductInfoController.java

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.doumu;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.domain.vo.DoumuProductInfoVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 痘姆古陶信息Controller
- * 
+ *
  * @author boman
  * @date 2024-01-16
  */
@@ -91,12 +93,23 @@ public class DoumuProductInfoController extends BaseController
         return toAjax(doumuProductInfoService.updateDoumuProductInfo(doumuProductInfo));
     }
 
+    /**
+     * 修改痘姆古陶流程
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:flow')")
+    @Log(title = "痘姆古陶流程", businessType = BusinessType.UPDATE)
+    @PostMapping("/put/flow")
+    public AjaxResult editFlow(@RequestBody DoumuProductInfoVo doumuProductInfoVo)
+    {
+        return toAjax(doumuProductInfoService.editFlow(doumuProductInfoVo));
+    }
+
     /**
      * 删除痘姆古陶信息
      */
     @PreAuthorize("@ss.hasPermi('system:info:remove')")
     @Log(title = "痘姆古陶信息", businessType = BusinessType.DELETE)
-	@GetMapping("/delete/{productIds}")
+    @GetMapping("/delete/{productIds}")
     public AjaxResult remove(@PathVariable Long[] productIds)
     {
         return toAjax(doumuProductInfoService.deleteDoumuProductInfoByProductIds(productIds));

ruoyi-system/src/main/java/com/ruoyi/system/domain/DoumuProductFi.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/DoumuProductFj.java

@@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author boman
  * @date 2024-01-16
  */
-public class DoumuProductFi extends BaseEntity
+public class DoumuProductFj extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/DoumuProductHistory.java

@@ -38,14 +38,53 @@ public class DoumuProductHistory extends BaseEntity
     @Excel(name = "手机号码")
     private String phonenumber;
 
+    /** 数量 */
+    @Excel(name = "数量")
+    private String quantity;
+
+    /** 省编号 */
+    private String provinceId;
+
+    /** 省 */
+    @Excel(name = "省")
+    private String province;
+
+    /** 市id */
+    private String cityId;
+
+    /** 市 */
+    @Excel(name = "市")
+    private String city;
+
+    /** 区县id */
+    private String countyId;
+
+    /** 区县 */
+    private String county;
+
     /** 收货地址 */
     @Excel(name = "收货地址")
     private String address;
 
+    /** 经度 */
+    private String lon;
+
+    /** 纬度 */
+    private String lat;
+
     /** 当前流程记录（字典值，用户自己配置） */
     @Excel(name = "当前流程记录", readConverterExp = "字=典值，用户自己配置")
     private String flowType;
 
+    /** 1:未支付,2:已支付，3：已结束（已邮寄或已自取） */
+    @Excel(name = "订单状态", readConverterExp = "1=未支付,2=已支付,3=已结束")
+    private String status;
+
+
+    /** 快递单号 */
+    @Excel(name = "快递单号")
+    private String mailNo;
+
     public void setHistoryId(Long historyId) 
     {
         this.historyId = historyId;
@@ -118,6 +157,94 @@ public class DoumuProductHistory extends BaseEntity
         this.orderNumber = orderNumber;
     }
 
+    public String getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(String provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(String cityId) {
+        this.cityId = cityId;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCountyId() {
+        return countyId;
+    }
+
+    public void setCountyId(String countyId) {
+        this.countyId = countyId;
+    }
+
+    public String getCounty() {
+        return county;
+    }
+
+    public void setCounty(String county) {
+        this.county = county;
+    }
+
+    public String getLon() {
+        return lon;
+    }
+
+    public void setLon(String lon) {
+        this.lon = lon;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getMailNo() {
+        return mailNo;
+    }
+
+    public void setMailNo(String mailNo) {
+        this.mailNo = mailNo;
+    }
+
     @Override
     public String toString() {
         return "DoumuProductHistory{" +

ruoyi-system/src/main/java/com/ruoyi/system/domain/DoumuProductInfo.java

@@ -5,9 +5,11 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 痘姆古陶信息对象 doumu_product_info
- * 
+ *
  * @author boman
  * @date 2024-01-16
  */
@@ -34,78 +36,145 @@ public class DoumuProductInfo extends BaseEntity
     @Excel(name = "手机号码")
     private String phonenumber;
 
+    /** 数量 */
+    @Excel(name = "数量")
+    private String quantity;
+
+    /** 省编号 */
+    private String provinceId;
+
+    /** 省 */
+    @Excel(name = "省")
+    private String province;
+
+    /** 市id */
+    private String cityId;
+
+    /** 市 */
+    @Excel(name = "市")
+    private String city;
+
+    /** 区县id */
+    private String countyId;
+
+    /** 区县 */
+    private String county;
+
     /** 收货地址 */
     @Excel(name = "收货地址")
     private String address;
 
+    /** 经度 */
+    private String lon;
+
+    /** 纬度 */
+    private String lat;
+
+
     /** 当前流程记录（字典值，用户自己配置） */
     @Excel(name = "当前流程记录", readConverterExp = "字=典值，用户自己配置")
     private String flowType;
 
+    /** 1:未支付,2:已支付，3：已结束（已邮寄或已自取） */
+    @Excel(name = "订单状态", readConverterExp = "1=未支付,2=已支付,3=已结束")
+    private String status;
+
+
     /** 快递单号 */
     @Excel(name = "快递单号")
     private String mailNo;
 
-    public void setProductId(Long productId) 
+
+
+    private String beginTime;
+    private String endTime;
+
+    private List<DoumuProductFj> fjList;
+
+    public List<DoumuProductFj> getFjList() {
+        return fjList;
+    }
+
+    public void setFjList(List<DoumuProductFj> fjList) {
+        this.fjList = fjList;
+    }
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public void setProductId(Long productId)
     {
         this.productId = productId;
     }
 
-    public Long getProductId() 
+    public Long getProductId()
     {
         return productId;
     }
-    public void setName(String name) 
+    public void setName(String name)
     {
         this.name = name;
     }
 
-    public String getName() 
+    public String getName()
     {
         return name;
     }
-    public void setDeliveryType(String deliveryType) 
+    public void setDeliveryType(String deliveryType)
     {
         this.deliveryType = deliveryType;
     }
 
-    public String getDeliveryType() 
+    public String getDeliveryType()
     {
         return deliveryType;
     }
-    public void setPhonenumber(String phonenumber) 
+    public void setPhonenumber(String phonenumber)
     {
         this.phonenumber = phonenumber;
     }
 
-    public String getPhonenumber() 
+    public String getPhonenumber()
     {
         return phonenumber;
     }
-    public void setAddress(String address) 
+    public void setAddress(String address)
     {
         this.address = address;
     }
 
-    public String getAddress() 
+    public String getAddress()
     {
         return address;
     }
-    public void setFlowType(String flowType) 
+    public void setFlowType(String flowType)
     {
         this.flowType = flowType;
     }
 
-    public String getFlowType() 
+    public String getFlowType()
     {
         return flowType;
     }
-    public void setMailNo(String mailNo) 
+    public void setMailNo(String mailNo)
     {
         this.mailNo = mailNo;
     }
 
-    public String getMailNo() 
+    public String getMailNo()
     {
         return mailNo;
     }
@@ -118,6 +187,86 @@ public class DoumuProductInfo extends BaseEntity
         this.orderNumber = orderNumber;
     }
 
+    public String getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(String provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(String cityId) {
+        this.cityId = cityId;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCountyId() {
+        return countyId;
+    }
+
+    public void setCountyId(String countyId) {
+        this.countyId = countyId;
+    }
+
+    public String getCounty() {
+        return county;
+    }
+
+    public void setCounty(String county) {
+        this.county = county;
+    }
+
+    public String getLon() {
+        return lon;
+    }
+
+    public void setLon(String lon) {
+        this.lon = lon;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
+    }
+
     @Override
     public String toString() {
         return "DoumuProductInfo{" +

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/DoumuProductInfoVo.java

@@ -0,0 +1,238 @@
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.common.annotation.Excel;
+
+import java.util.List;
+
+public class DoumuProductInfoVo {
+
+    /** ID */
+    private List<Long> productIdList;
+
+    /** 订单号 */
+    private String orderNumber;
+
+    /** 联系人姓名 */
+    private String name;
+
+    /** 交付方式（1：邮寄，2：自取） */
+    private String deliveryType;
+
+    /** 手机号码 */
+    private String phonenumber;
+
+    /** 数量 */
+    private String quantity;
+
+    /** 省编号 */
+    private String provinceId;
+
+    /** 省 */
+    private String province;
+
+    /** 市id */
+    private String cityId;
+
+    /** 市 */
+    private String city;
+
+    /** 区县id */
+    private String countyId;
+
+    /** 区县 */
+    private String county;
+
+    /** 收货地址 */
+    private String address;
+
+    /** 经度 */
+    private String lon;
+
+    /** 纬度 */
+    private String lat;
+
+
+    /** 当前流程记录（字典值，用户自己配置） */
+    private String flowType;
+
+    /** 1:未支付,2:已支付，3：已结束（已邮寄或已自取） */
+    private String status;
+
+
+    /** 快递单号 */
+    private String mailNo;
+
+
+
+    private String beginTime;
+    private String endTime;
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public List<Long> getProductIdList() {
+        return productIdList;
+    }
+
+    public void setProductIdList(List<Long> productIdList) {
+        this.productIdList = productIdList;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setDeliveryType(String deliveryType)
+    {
+        this.deliveryType = deliveryType;
+    }
+
+    public String getDeliveryType()
+    {
+        return deliveryType;
+    }
+    public void setPhonenumber(String phonenumber)
+    {
+        this.phonenumber = phonenumber;
+    }
+
+    public String getPhonenumber()
+    {
+        return phonenumber;
+    }
+    public void setAddress(String address)
+    {
+        this.address = address;
+    }
+
+    public String getAddress()
+    {
+        return address;
+    }
+    public void setFlowType(String flowType)
+    {
+        this.flowType = flowType;
+    }
+
+    public String getFlowType()
+    {
+        return flowType;
+    }
+    public void setMailNo(String mailNo)
+    {
+        this.mailNo = mailNo;
+    }
+
+    public String getMailNo()
+    {
+        return mailNo;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(String provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(String cityId) {
+        this.cityId = cityId;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCountyId() {
+        return countyId;
+    }
+
+    public void setCountyId(String countyId) {
+        this.countyId = countyId;
+    }
+
+    public String getCounty() {
+        return county;
+    }
+
+    public void setCounty(String county) {
+        this.county = county;
+    }
+
+    public String getLon() {
+        return lon;
+    }
+
+    public void setLon(String lon) {
+        this.lon = lon;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
+    }
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/DoumuProductFiMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/DoumuProductFjMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
-import com.ruoyi.system.domain.DoumuProductFi;
+import com.ruoyi.system.domain.DoumuProductFj;
 
 /**
  * 痘姆古陶_附件Mapper接口
@@ -9,7 +9,7 @@ import com.ruoyi.system.domain.DoumuProductFi;
  * @author boman
  * @date 2024-01-16
  */
-public interface DoumuProductFiMapper 
+public interface DoumuProductFjMapper
 {
     /**
      * 查询痘姆古陶_附件
@@ -17,31 +17,31 @@ public interface DoumuProductFiMapper
      * @param fiId 痘姆古陶_附件主键
      * @return 痘姆古陶_附件
      */
-    public DoumuProductFi selectDoumuProductFiByFiId(Long fiId);
+    public DoumuProductFj selectDoumuProductFjByFiId(Long fiId);
 
     /**
      * 查询痘姆古陶_附件列表
      * 
-     * @param doumuProductFi 痘姆古陶_附件
+     * @param doumuProductFj 痘姆古陶_附件
      * @return 痘姆古陶_附件集合
      */
-    public List<DoumuProductFi> selectDoumuProductFiList(DoumuProductFi doumuProductFi);
+    public List<DoumuProductFj> selectDoumuProductFjList(DoumuProductFj doumuProductFj);
 
     /**
      * 新增痘姆古陶_附件
      * 
-     * @param doumuProductFi 痘姆古陶_附件
+     * @param doumuProductFj 痘姆古陶_附件
      * @return 结果
      */
-    public int insertDoumuProductFi(DoumuProductFi doumuProductFi);
+    public int insertDoumuProductFj(DoumuProductFj doumuProductFj);
 
     /**
      * 修改痘姆古陶_附件
      * 
-     * @param doumuProductFi 痘姆古陶_附件
+     * @param doumuProductFj 痘姆古陶_附件
      * @return 结果
      */
-    public int updateDoumuProductFi(DoumuProductFi doumuProductFi);
+    public int updateDoumuProductFj(DoumuProductFj doumuProductFj);
 
     /**
      * 删除痘姆古陶_附件
@@ -49,7 +49,7 @@ public interface DoumuProductFiMapper
      * @param fiId 痘姆古陶_附件主键
      * @return 结果
      */
-    public int deleteDoumuProductFiByFiId(Long fiId);
+    public int deleteDoumuProductFjByFiId(Long fiId);
 
     /**
      * 批量删除痘姆古陶_附件
@@ -57,5 +57,5 @@ public interface DoumuProductFiMapper
      * @param fiIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteDoumuProductFiByFiIds(Long[] fiIds);
+    public int deleteDoumuProductFjByFiIds(Long[] fiIds);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/DoumuProductInfoMapper.java

@@ -2,18 +2,20 @@ package com.ruoyi.system.mapper;
 
 import java.util.List;
 import com.ruoyi.system.domain.DoumuProductInfo;
+import com.ruoyi.system.domain.vo.DoumuProductInfoVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 痘姆古陶信息Mapper接口
- * 
+ *
  * @author boman
  * @date 2024-01-16
  */
-public interface DoumuProductInfoMapper 
+public interface DoumuProductInfoMapper
 {
     /**
      * 查询痘姆古陶信息
-     * 
+     *
      * @param productId 痘姆古陶信息主键
      * @return 痘姆古陶信息
      */
@@ -21,7 +23,7 @@ public interface DoumuProductInfoMapper
 
     /**
      * 查询痘姆古陶信息列表
-     * 
+     *
      * @param doumuProductInfo 痘姆古陶信息
      * @return 痘姆古陶信息集合
      */
@@ -29,7 +31,7 @@ public interface DoumuProductInfoMapper
 
     /**
      * 新增痘姆古陶信息
-     * 
+     *
      * @param doumuProductInfo 痘姆古陶信息
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface DoumuProductInfoMapper
 
     /**
      * 修改痘姆古陶信息
-     * 
+     *
      * @param doumuProductInfo 痘姆古陶信息
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface DoumuProductInfoMapper
 
     /**
      * 删除痘姆古陶信息
-     * 
+     *
      * @param productId 痘姆古陶信息主键
      * @return 结果
      */
@@ -53,9 +55,11 @@ public interface DoumuProductInfoMapper
 
     /**
      * 批量删除痘姆古陶信息
-     * 
+     *
      * @param productIds 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteDoumuProductInfoByProductIds(Long[] productIds);
+
+    int updateDoumuProductInfoFlowList(@Param("productIdList") List<Long> productIdList, @Param("flowType") String flowType);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IDoumuProductFiService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/IDoumuProductFjService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
-import com.ruoyi.system.domain.DoumuProductFi;
+import com.ruoyi.system.domain.DoumuProductFj;
 
 /**
  * 痘姆古陶_附件Service接口
@@ -9,7 +9,7 @@ import com.ruoyi.system.domain.DoumuProductFi;
  * @author boman
  * @date 2024-01-16
  */
-public interface IDoumuProductFiService 
+public interface IDoumuProductFjService
 {
     /**
      * 查询痘姆古陶_附件
@@ -17,31 +17,31 @@ public interface IDoumuProductFiService
      * @param fiId 痘姆古陶_附件主键
      * @return 痘姆古陶_附件
      */
-    public DoumuProductFi selectDoumuProductFiByFiId(Long fiId);
+    public DoumuProductFj selectDoumuProductFjByFiId(Long fiId);
 
     /**
      * 查询痘姆古陶_附件列表
      * 
-     * @param doumuProductFi 痘姆古陶_附件
+     * @param doumuProductFj 痘姆古陶_附件
      * @return 痘姆古陶_附件集合
      */
-    public List<DoumuProductFi> selectDoumuProductFiList(DoumuProductFi doumuProductFi);
+    public List<DoumuProductFj> selectDoumuProductFjList(DoumuProductFj doumuProductFj);
 
     /**
      * 新增痘姆古陶_附件
      * 
-     * @param doumuProductFi 痘姆古陶_附件
+     * @param doumuProductFj 痘姆古陶_附件
      * @return 结果
      */
-    public int insertDoumuProductFi(DoumuProductFi doumuProductFi);
+    public int insertDoumuProductFj(DoumuProductFj doumuProductFj);
 
     /**
      * 修改痘姆古陶_附件
      * 
-     * @param doumuProductFi 痘姆古陶_附件
+     * @param doumuProductFj 痘姆古陶_附件
      * @return 结果
      */
-    public int updateDoumuProductFi(DoumuProductFi doumuProductFi);
+    public int updateDoumuProductFj(DoumuProductFj doumuProductFj);
 
     /**
      * 批量删除痘姆古陶_附件
@@ -49,7 +49,7 @@ public interface IDoumuProductFiService
      * @param fiIds 需要删除的痘姆古陶_附件主键集合
      * @return 结果
      */
-    public int deleteDoumuProductFiByFiIds(Long[] fiIds);
+    public int deleteDoumuProductFjByFiIds(Long[] fiIds);
 
     /**
      * 删除痘姆古陶_附件信息
@@ -57,5 +57,5 @@ public interface IDoumuProductFiService
      * @param fiId 痘姆古陶_附件主键
      * @return 结果
      */
-    public int deleteDoumuProductFiByFiId(Long fiId);
+    public int deleteDoumuProductFjByFiId(Long fiId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IDoumuProductInfoService.java

@@ -2,18 +2,19 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 import com.ruoyi.system.domain.DoumuProductInfo;
+import com.ruoyi.system.domain.vo.DoumuProductInfoVo;
 
 /**
  * 痘姆古陶信息Service接口
- * 
+ *
  * @author boman
  * @date 2024-01-16
  */
-public interface IDoumuProductInfoService 
+public interface IDoumuProductInfoService
 {
     /**
      * 查询痘姆古陶信息
-     * 
+     *
      * @param productId 痘姆古陶信息主键
      * @return 痘姆古陶信息
      */
@@ -21,7 +22,7 @@ public interface IDoumuProductInfoService
 
     /**
      * 查询痘姆古陶信息列表
-     * 
+     *
      * @param doumuProductInfo 痘姆古陶信息
      * @return 痘姆古陶信息集合
      */
@@ -29,7 +30,7 @@ public interface IDoumuProductInfoService
 
     /**
      * 新增痘姆古陶信息
-     * 
+     *
      * @param doumuProductInfo 痘姆古陶信息
      * @return 结果
      */
@@ -37,7 +38,7 @@ public interface IDoumuProductInfoService
 
     /**
      * 修改痘姆古陶信息
-     * 
+     *
      * @param doumuProductInfo 痘姆古陶信息
      * @return 结果
      */
@@ -45,7 +46,7 @@ public interface IDoumuProductInfoService
 
     /**
      * 批量删除痘姆古陶信息
-     * 
+     *
      * @param productIds 需要删除的痘姆古陶信息主键集合
      * @return 结果
      */
@@ -53,9 +54,11 @@ public interface IDoumuProductInfoService
 
     /**
      * 删除痘姆古陶信息信息
-     * 
+     *
      * @param productId 痘姆古陶信息主键
      * @return 结果
      */
     public int deleteDoumuProductInfoByProductId(Long productId);
+
+    int editFlow(DoumuProductInfoVo doumuProductInfoVo);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DoumuProductFiServiceImpl.java

@@ -1,93 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.system.mapper.DoumuProductFiMapper;
-import com.ruoyi.system.domain.DoumuProductFi;
-import com.ruoyi.system.service.IDoumuProductFiService;
-
-/**
- * 痘姆古陶_附件Service业务层处理
- * 
- * @author boman
- * @date 2024-01-16
- */
-@Service
-public class DoumuProductFiServiceImpl implements IDoumuProductFiService 
-{
-    @Autowired
-    private DoumuProductFiMapper doumuProductFiMapper;
-
-    /**
-     * 查询痘姆古陶_附件
-     * 
-     * @param fiId 痘姆古陶_附件主键
-     * @return 痘姆古陶_附件
-     */
-    @Override
-    public DoumuProductFi selectDoumuProductFiByFiId(Long fiId)
-    {
-        return doumuProductFiMapper.selectDoumuProductFiByFiId(fiId);
-    }
-
-    /**
-     * 查询痘姆古陶_附件列表
-     * 
-     * @param doumuProductFi 痘姆古陶_附件
-     * @return 痘姆古陶_附件
-     */
-    @Override
-    public List<DoumuProductFi> selectDoumuProductFiList(DoumuProductFi doumuProductFi)
-    {
-        return doumuProductFiMapper.selectDoumuProductFiList(doumuProductFi);
-    }
-
-    /**
-     * 新增痘姆古陶_附件
-     * 
-     * @param doumuProductFi 痘姆古陶_附件
-     * @return 结果
-     */
-    @Override
-    public int insertDoumuProductFi(DoumuProductFi doumuProductFi)
-    {
-        return doumuProductFiMapper.insertDoumuProductFi(doumuProductFi);
-    }
-
-    /**
-     * 修改痘姆古陶_附件
-     * 
-     * @param doumuProductFi 痘姆古陶_附件
-     * @return 结果
-     */
-    @Override
-    public int updateDoumuProductFi(DoumuProductFi doumuProductFi)
-    {
-        return doumuProductFiMapper.updateDoumuProductFi(doumuProductFi);
-    }
-
-    /**
-     * 批量删除痘姆古陶_附件
-     * 
-     * @param fiIds 需要删除的痘姆古陶_附件主键
-     * @return 结果
-     */
-    @Override
-    public int deleteDoumuProductFiByFiIds(Long[] fiIds)
-    {
-        return doumuProductFiMapper.deleteDoumuProductFiByFiIds(fiIds);
-    }
-
-    /**
-     * 删除痘姆古陶_附件信息
-     * 
-     * @param fiId 痘姆古陶_附件主键
-     * @return 结果
-     */
-    @Override
-    public int deleteDoumuProductFiByFiId(Long fiId)
-    {
-        return doumuProductFiMapper.deleteDoumuProductFiByFiId(fiId);
-    }
-}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DoumuProductFjServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.DoumuProductFjMapper;
+import com.ruoyi.system.domain.DoumuProductFj;
+import com.ruoyi.system.service.IDoumuProductFjService;
+
+/**
+ * 痘姆古陶_附件Service业务层处理
+ * 
+ * @author boman
+ * @date 2024-01-16
+ */
+@Service
+public class DoumuProductFjServiceImpl implements IDoumuProductFjService
+{
+    @Autowired
+    private DoumuProductFjMapper doumuProductFjMapper;
+
+    /**
+     * 查询痘姆古陶_附件
+     * 
+     * @param fiId 痘姆古陶_附件主键
+     * @return 痘姆古陶_附件
+     */
+    @Override
+    public DoumuProductFj selectDoumuProductFjByFiId(Long fiId)
+    {
+        return doumuProductFjMapper.selectDoumuProductFjByFiId(fiId);
+    }
+
+    /**
+     * 查询痘姆古陶_附件列表
+     * 
+     * @param doumuProductFj 痘姆古陶_附件
+     * @return 痘姆古陶_附件
+     */
+    @Override
+    public List<DoumuProductFj> selectDoumuProductFjList(DoumuProductFj doumuProductFj)
+    {
+        return doumuProductFjMapper.selectDoumuProductFjList(doumuProductFj);
+    }
+
+    /**
+     * 新增痘姆古陶_附件
+     * 
+     * @param doumuProductFj 痘姆古陶_附件
+     * @return 结果
+     */
+    @Override
+    public int insertDoumuProductFj(DoumuProductFj doumuProductFj)
+    {
+        return doumuProductFjMapper.insertDoumuProductFj(doumuProductFj);
+    }
+
+    /**
+     * 修改痘姆古陶_附件
+     * 
+     * @param doumuProductFj 痘姆古陶_附件
+     * @return 结果
+     */
+    @Override
+    public int updateDoumuProductFj(DoumuProductFj doumuProductFj)
+    {
+        return doumuProductFjMapper.updateDoumuProductFj(doumuProductFj);
+    }
+
+    /**
+     * 批量删除痘姆古陶_附件
+     * 
+     * @param fiIds 需要删除的痘姆古陶_附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDoumuProductFjByFiIds(Long[] fiIds)
+    {
+        return doumuProductFjMapper.deleteDoumuProductFjByFiIds(fiIds);
+    }
+
+    /**
+     * 删除痘姆古陶_附件信息
+     * 
+     * @param fiId 痘姆古陶_附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDoumuProductFjByFiId(Long fiId)
+    {
+        return doumuProductFjMapper.deleteDoumuProductFjByFiId(fiId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DoumuProductHistoryServiceImpl.java

@@ -53,6 +53,7 @@ public class DoumuProductHistoryServiceImpl implements IDoumuProductHistoryServi
     @Override
     public int insertDoumuProductHistory(DoumuProductHistory doumuProductHistory)
     {
+
         doumuProductHistory.setCreateTime(DateUtils.getNowDate());
         return doumuProductHistoryMapper.insertDoumuProductHistory(doumuProductHistory);
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DoumuProductInfoServiceImpl.java

@@ -1,7 +1,13 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.DoumuProductFj;
+import com.ruoyi.system.domain.vo.DoumuProductInfoVo;
+import com.ruoyi.system.mapper.DoumuProductFjMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.DoumuProductInfoMapper;
@@ -10,56 +16,84 @@ import com.ruoyi.system.service.IDoumuProductInfoService;
 
 /**
  * 痘姆古陶信息Service业务层处理
- * 
+ *
  * @author boman
  * @date 2024-01-16
  */
 @Service
-public class DoumuProductInfoServiceImpl implements IDoumuProductInfoService 
+public class DoumuProductInfoServiceImpl implements IDoumuProductInfoService
 {
     @Autowired
     private DoumuProductInfoMapper doumuProductInfoMapper;
 
+    @Autowired
+    private DoumuProductFjMapper doumuProductFjMapper;
+
     /**
      * 查询痘姆古陶信息
-     * 
+     *
      * @param productId 痘姆古陶信息主键
      * @return 痘姆古陶信息
      */
     @Override
     public DoumuProductInfo selectDoumuProductInfoByProductId(Long productId)
     {
-        return doumuProductInfoMapper.selectDoumuProductInfoByProductId(productId);
+        DoumuProductInfo doumuProductInfo = doumuProductInfoMapper.selectDoumuProductInfoByProductId(productId);
+        //查询附件
+        DoumuProductFj doumuProductFj = new DoumuProductFj();
+        doumuProductFj.setProductId(productId);
+        List<DoumuProductFj> fjList = doumuProductFjMapper.selectDoumuProductFjList(doumuProductFj);
+        doumuProductInfo.setFjList(fjList);
+        return doumuProductInfo;
     }
 
     /**
      * 查询痘姆古陶信息列表
-     * 
+     *
      * @param doumuProductInfo 痘姆古陶信息
      * @return 痘姆古陶信息
      */
     @Override
     public List<DoumuProductInfo> selectDoumuProductInfoList(DoumuProductInfo doumuProductInfo)
     {
-        return doumuProductInfoMapper.selectDoumuProductInfoList(doumuProductInfo);
+        List<DoumuProductInfo> doumuProductInfoList = doumuProductInfoMapper.selectDoumuProductInfoList(doumuProductInfo);
+        for (DoumuProductInfo productInfo : doumuProductInfoList) {
+            //查询附件
+            DoumuProductFj doumuProductFj = new DoumuProductFj();
+            doumuProductFj.setProductId(productInfo.getProductId());
+            List<DoumuProductFj> fjList = doumuProductFjMapper.selectDoumuProductFjList(doumuProductFj);
+            productInfo.setFjList(fjList);
+        }
+        return doumuProductInfoList;
     }
 
     /**
      * 新增痘姆古陶信息
-     * 
+     *
      * @param doumuProductInfo 痘姆古陶信息
      * @return 结果
      */
     @Override
     public int insertDoumuProductInfo(DoumuProductInfo doumuProductInfo)
     {
+        doumuProductInfo.setOrderNumber("DMGT"+System.currentTimeMillis());
         doumuProductInfo.setCreateTime(DateUtils.getNowDate());
-        return doumuProductInfoMapper.insertDoumuProductInfo(doumuProductInfo);
+        int i = doumuProductInfoMapper.insertDoumuProductInfo(doumuProductInfo);
+
+        //保存附件
+        List<DoumuProductFj> fjList = doumuProductInfo.getFjList();
+        if(fjList!=null && fjList.size()>0){
+            for (DoumuProductFj doumuProductFj : fjList) {
+                doumuProductFj.setProductId(doumuProductInfo.getProductId());
+                doumuProductFjMapper.insertDoumuProductFj(doumuProductFj);
+            }
+        }
+        return i;
     }
 
     /**
      * 修改痘姆古陶信息
-     * 
+     *
      * @param doumuProductInfo 痘姆古陶信息
      * @return 结果
      */
@@ -67,12 +101,25 @@ public class DoumuProductInfoServiceImpl implements IDoumuProductInfoService
     public int updateDoumuProductInfo(DoumuProductInfo doumuProductInfo)
     {
         doumuProductInfo.setUpdateTime(DateUtils.getNowDate());
+
+        //保存附件
+        List<DoumuProductFj> fjList = doumuProductInfo.getFjList();
+        if(fjList!=null && fjList.size()>0){
+            for (DoumuProductFj doumuProductFj : fjList) {
+                //先删除附件
+                doumuProductFjMapper.deleteDoumuProductFjByFiId(doumuProductFj.getFiId());
+                //在保存附件
+                doumuProductFj.setProductId(doumuProductInfo.getProductId());
+                doumuProductFjMapper.insertDoumuProductFj(doumuProductFj);
+            }
+        }
+
         return doumuProductInfoMapper.updateDoumuProductInfo(doumuProductInfo);
     }
 
     /**
      * 批量删除痘姆古陶信息
-     * 
+     *
      * @param productIds 需要删除的痘姆古陶信息主键
      * @return 结果
      */
@@ -84,7 +131,7 @@ public class DoumuProductInfoServiceImpl implements IDoumuProductInfoService
 
     /**
      * 删除痘姆古陶信息信息
-     * 
+     *
      * @param productId 痘姆古陶信息主键
      * @return 结果
      */
@@ -93,4 +140,20 @@ public class DoumuProductInfoServiceImpl implements IDoumuProductInfoService
     {
         return doumuProductInfoMapper.deleteDoumuProductInfoByProductId(productId);
     }
+
+    /**
+     * 批量修改流程
+     *
+     * @param doumuProductInfoVo 痘姆古陶信息VO
+     * @return 结果
+     */
+    @Override
+    public int editFlow(DoumuProductInfoVo doumuProductInfoVo) {
+        if(doumuProductInfoVo.getProductIdList() == null || doumuProductInfoVo.getProductIdList().size()<=0){
+            throw new ServiceException("请选择要修改的订单", HttpStatus.WARN);
+        }
+        List<Long> productIdList = doumuProductInfoVo.getProductIdList();
+        String flowType = doumuProductInfoVo.getFlowType();
+        return doumuProductInfoMapper.updateDoumuProductInfoFlowList(productIdList,flowType);
+    }
 }

ruoyi-system/src/main/resources/mapper/system/DoumuProductFiMapper.xml → ruoyi-system/src/main/resources/mapper/system/DoumuProductFjMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.DoumuProductFiMapper">
+<mapper namespace="com.ruoyi.system.mapper.DoumuProductFjMapper">
     
-    <resultMap type="DoumuProductFi" id="DoumuProductFiResult">
+    <resultMap type="DoumuProductFj" id="DoumuProductFjResult">
         <result property="fiId"    column="fi_id"    />
         <result property="productId"    column="product_id"    />
         <result property="fjName"    column="fj_name"    />
@@ -12,12 +12,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
     </resultMap>
 
-    <sql id="selectDoumuProductFiVo">
-        select fi_id, product_id, fj_name, path, remark from doumu_product_fi
+    <sql id="selectDoumuProductFjVo">
+        select fi_id, product_id, fj_name, path, remark from doumu_product_fj
     </sql>
 
-    <select id="selectDoumuProductFiList" parameterType="DoumuProductFi" resultMap="DoumuProductFiResult">
-        <include refid="selectDoumuProductFiVo"/>
+    <select id="selectDoumuProductFjList" parameterType="DoumuProductFj" resultMap="DoumuProductFjResult">
+        <include refid="selectDoumuProductFjVo"/>
         <where>  
             <if test="productId != null "> and product_id = #{productId}</if>
             <if test="fjName != null  and fjName != ''"> and fj_name like concat('%', #{fjName}, '%')</if>
@@ -25,12 +25,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectDoumuProductFiByFiId" parameterType="Long" resultMap="DoumuProductFiResult">
-        <include refid="selectDoumuProductFiVo"/>
+    <select id="selectDoumuProductFjByFiId" parameterType="Long" resultMap="DoumuProductFjResult">
+        <include refid="selectDoumuProductFjVo"/>
         where fi_id = #{fiId}
     </select>
         
-    <insert id="insertDoumuProductFi" parameterType="DoumuProductFi" useGeneratedKeys="true" keyProperty="fiId">
+    <insert id="insertDoumuProductFj" parameterType="DoumuProductFj" useGeneratedKeys="true" keyProperty="fiId">
         insert into doumu_product_fi
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="productId != null">product_id,</if>
@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateDoumuProductFi" parameterType="DoumuProductFi">
+    <update id="updateDoumuProductFj" parameterType="DoumuProductFj">
         update doumu_product_fi
         <trim prefix="SET" suffixOverrides=",">
             <if test="productId != null">product_id = #{productId},</if>
@@ -57,11 +57,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where fi_id = #{fiId}
     </update>
 
-    <delete id="deleteDoumuProductFiByFiId" parameterType="Long">
+    <delete id="deleteDoumuProductFjByFiId" parameterType="Long">
         delete from doumu_product_fi where fi_id = #{fiId}
     </delete>
 
-    <delete id="deleteDoumuProductFiByFiIds" parameterType="String">
+    <delete id="deleteDoumuProductFjByFiIds" parameterType="String">
         delete from doumu_product_fi where fi_id in 
         <foreach item="fiId" collection="array" open="(" separator="," close=")">
             #{fiId}

ruoyi-system/src/main/resources/mapper/system/DoumuProductHistoryMapper.xml

@@ -11,8 +11,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="name"    column="name"    />
         <result property="deliveryType"    column="delivery_type"    />
         <result property="phonenumber"    column="phonenumber"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="provinceId"    column="province_id"    />
+        <result property="province"    column="province"    />
+        <result property="cityId"    column="city_id"    />
+        <result property="city"    column="city"    />
+        <result property="countyId"    column="county_id"    />
+        <result property="county"    column="county"    />
         <result property="address"    column="address"    />
+        <result property="lon"    column="lon"    />
+        <result property="lat"    column="lat"    />
         <result property="flowType"    column="flow_type"    />
+        <result property="status"    column="status"    />
+        <result property="mailNo"    column="mail_no"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -21,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDoumuProductHistoryVo">
-        select history_id,order_number, product_id, name, delivery_type, phonenumber, address, flow_type, create_by, create_time, update_by, update_time, remark from doumu_product_history
+        select history_id,order_number, product_id, name, delivery_type, phonenumber,quantity,province_id,province,city_id,city,county_id,county,lon,lat,status, address, flow_type, mail_no, create_by, create_time, update_by, update_time, remark from doumu_product_history
     </sql>
 
     <select id="selectDoumuProductHistoryList" parameterType="DoumuProductHistory" resultMap="DoumuProductHistoryResult">
@@ -34,7 +45,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="phonenumber != null  and phonenumber != ''"> and phonenumber = #{phonenumber}</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="flowType != null  and flowType != ''"> and flow_type = #{flowType}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="mailNo != null  and mailNo != ''"> and mailNo = #{mailNo}</if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(create_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+            </if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectDoumuProductHistoryByHistoryId" parameterType="Long" resultMap="DoumuProductHistoryResult">
@@ -50,8 +70,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null and name != ''">name,</if>
             <if test="deliveryType != null">delivery_type,</if>
             <if test="phonenumber != null">phonenumber,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="provinceId != null">province_id,</if>
+            <if test="province != null">province,</if>
+            <if test="cityId != null">city_id,</if>
+            <if test="city != null">city,</if>
+            <if test="countyId != null">county_id,</if>
+            <if test="county != null">county,</if>
             <if test="address != null">address,</if>
+            <if test="lon != null">lon,</if>
+            <if test="lat != null">lat,</if>
             <if test="flowType != null">flow_type,</if>
+            <if test="status != null">status,</if>
+            <if test="mailNo != null">mailNo,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -63,8 +94,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderNumber != null ">#{orderNumber},</if>
             <if test="name != null and name != ''">#{name},</if>
             <if test="deliveryType != null">#{deliveryType},</if>
-            <if test="phonenumber != null">#{phonenumber},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="provinceId != null">#{provinceId},</if>
+            <if test="province != null">#{province},</if>
+            <if test="cityId != null">#{cityId},</if>
+            <if test="city != null">#{city},</if>
+            <if test="countyId != null">#{countyId},</if>
+            <if test="county != null">#{county},</if>
             <if test="address != null">#{address},</if>
+            <if test="lon != null">#{lon},</if>
+            <if test="lat != null">#{lat},</if>
+            <if test="flowType != null">#{flowType},</if>
+            <if test="status != null">#{status},</if>
+            <if test="mailNo != null">#{mailNo},</if>
             <if test="flowType != null">#{flowType},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -81,8 +123,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderNumber != null  and orderNumber != ''"> order_number = #{orderNumber},</if>
             <if test="name != null and name != ''">name = #{name},</if>
             <if test="deliveryType != null">delivery_type = #{deliveryType},</if>
-            <if test="phonenumber != null">phonenumber = #{phonenumber},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="provinceId != null">province_id = #{provinceId},</if>
+            <if test="province != null">province = #{province},</if>
+            <if test="cityId != null">city_id = #{cityId},</if>
+            <if test="city != null">city = #{city},</if>
+            <if test="countyId != null">county_id = #{countyId},</if>
+            <if test="county != null">county = #{county},</if>
             <if test="address != null">address = #{address},</if>
+            <if test="lon != null">lon = #{lon},</if>
+            <if test="lat != null">lat = #{lat},</if>
+            <if test="flowType != null">flow_type = #{flowType},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="mailNo != null">mailNo = #{mailNo},</if>
             <if test="flowType != null">flow_type = #{flowType},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

ruoyi-system/src/main/resources/mapper/system/DoumuProductInfoMapper.xml

@@ -1,27 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.DoumuProductInfoMapper">
-    
+
     <resultMap type="DoumuProductInfo" id="DoumuProductInfoResult">
         <result property="productId"    column="product_id"    />
         <result property="orderNumber"    column="order_number"    />
         <result property="name"    column="name"    />
         <result property="deliveryType"    column="delivery_type"    />
         <result property="phonenumber"    column="phonenumber"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="provinceId"    column="province_id"    />
+        <result property="province"    column="province"    />
+        <result property="cityId"    column="city_id"    />
+        <result property="city"    column="city"    />
+        <result property="countyId"    column="county_id"    />
+        <result property="county"    column="county"    />
         <result property="address"    column="address"    />
+        <result property="lon"    column="lon"    />
+        <result property="lat"    column="lat"    />
         <result property="flowType"    column="flow_type"    />
-        <result property="mailNo"    column="mailNo"    />
+        <result property="status"    column="status"    />
+        <result property="mailNo"    column="mail_no"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+
+        <result property="beginTime"    column="beginTime"    />
+        <result property="endTime"    column="endTime"    />
     </resultMap>
 
     <sql id="selectDoumuProductInfoVo">
-        select product_id,order_number, name, delivery_type, phonenumber, address, flow_type, mailNo, create_by, create_time, update_by, update_time, remark from doumu_product_info
+        select product_id,order_number, name, delivery_type, phonenumber,quantity,province_id,province,city_id,city,county_id,county,lon,lat,status, address, flow_type, mail_no, create_by, create_time, update_by, update_time, remark from doumu_product_info
     </sql>
 
     <select id="selectDoumuProductInfoList" parameterType="DoumuProductInfo" resultMap="DoumuProductInfoResult">
@@ -33,15 +46,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="phonenumber != null  and phonenumber != ''"> and phonenumber = #{phonenumber}</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="flowType != null  and flowType != ''"> and flow_type = #{flowType}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="mailNo != null  and mailNo != ''"> and mailNo = #{mailNo}</if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(create_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+            </if>
         </where>
+        order by create_time desc
     </select>
-    
+
     <select id="selectDoumuProductInfoByProductId" parameterType="Long" resultMap="DoumuProductInfoResult">
         <include refid="selectDoumuProductInfoVo"/>
         where product_id = #{productId}
     </select>
-        
+
     <insert id="insertDoumuProductInfo" parameterType="DoumuProductInfo" useGeneratedKeys="true" keyProperty="productId">
         insert into doumu_product_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -49,29 +70,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null and name != ''">name,</if>
             <if test="deliveryType != null">delivery_type,</if>
             <if test="phonenumber != null">phonenumber,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="provinceId != null">province_id,</if>
+            <if test="province != null">province,</if>
+            <if test="cityId != null">city_id,</if>
+            <if test="city != null">city,</if>
+            <if test="countyId != null">county_id,</if>
+            <if test="county != null">county,</if>
             <if test="address != null">address,</if>
+            <if test="lon != null">lon,</if>
+            <if test="lat != null">lat,</if>
             <if test="flowType != null">flow_type,</if>
+            <if test="status != null">status,</if>
             <if test="mailNo != null">mailNo,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderNumber != null ">#{orderNumber},</if>
             <if test="name != null and name != ''">#{name},</if>
             <if test="deliveryType != null">#{deliveryType},</if>
             <if test="phonenumber != null">#{phonenumber},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="provinceId != null">#{provinceId},</if>
+            <if test="province != null">#{province},</if>
+            <if test="cityId != null">#{cityId},</if>
+            <if test="city != null">#{city},</if>
+            <if test="countyId != null">#{countyId},</if>
+            <if test="county != null">#{county},</if>
             <if test="address != null">#{address},</if>
+            <if test="lon != null">#{lon},</if>
+            <if test="lat != null">#{lat},</if>
             <if test="flowType != null">#{flowType},</if>
+            <if test="status != null">#{status},</if>
             <if test="mailNo != null">#{mailNo},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateDoumuProductInfo" parameterType="DoumuProductInfo">
@@ -81,8 +122,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null and name != ''">name = #{name},</if>
             <if test="deliveryType != null">delivery_type = #{deliveryType},</if>
             <if test="phonenumber != null">phonenumber = #{phonenumber},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="provinceId != null">province_id = #{provinceId},</if>
+            <if test="province != null">province = #{province},</if>
+            <if test="cityId != null">city_id = #{cityId},</if>
+            <if test="city != null">city = #{city},</if>
+            <if test="countyId != null">county_id = #{countyId},</if>
+            <if test="county != null">county = #{county},</if>
             <if test="address != null">address = #{address},</if>
+            <if test="lon != null">lon = #{lon},</if>
+            <if test="lat != null">lat = #{lat},</if>
             <if test="flowType != null">flow_type = #{flowType},</if>
+            <if test="status != null">status = #{status},</if>
             <if test="mailNo != null">mailNo = #{mailNo},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -93,12 +144,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where product_id = #{productId}
     </update>
 
+    <update id="updateDoumuProductInfoFlowList">
+        update doumu_product_info flow_type = #{flowType} where product_id in
+        <foreach collection="productIdList" index="index" item="productId" open="(" separator="," close=")">
+            #{productId}
+        </foreach>
+    </update>
+
     <delete id="deleteDoumuProductInfoByProductId" parameterType="Long">
         delete from doumu_product_info where product_id = #{productId}
     </delete>
 
     <delete id="deleteDoumuProductInfoByProductIds" parameterType="String">
-        delete from doumu_product_info where product_id in 
+        delete from doumu_product_info where product_id in
         <foreach item="productId" collection="array" open="(" separator="," close=")">
             #{productId}
         </foreach>

ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-		PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.SysMenuMapper">
-
-	<resultMap type="SysMenu" id="SysMenuResult">
-		<id     property="menuId"         column="menu_id"        />
-		<result property="menuName"       column="menu_name"      />
-		<result property="parentName"     column="parent_name"    />
-		<result property="parentId"       column="parent_id"      />
-		<result property="orderNum"       column="order_num"      />
-		<result property="path"           column="path"           />
-		<result property="component"      column="component"      />
-		<result property="query"          column="query"          />
-		<result property="isFrame"        column="is_frame"       />
-		<result property="isCache"        column="is_cache"       />
-		<result property="menuType"       column="menu_type"      />
-		<result property="visible"        column="visible"        />
-		<result property="status"         column="status"         />
-		<result property="perms"          column="perms"          />
-		<result property="icon"           column="icon"           />
-		<result property="createBy"       column="create_by"      />
-		<result property="createTime"     column="create_time"    />
-		<result property="updateTime"     column="update_time"    />
-		<result property="updateBy"       column="update_by"      />
-		<result property="remark"         column="remark"         />
-	</resultMap>
-
-	<sql id="selectMenuVo">
-        select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time 
-		from sys_menu
-    </sql>
-    
-    <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
-		<include refid="selectMenuVo"/>
-		<where>
-			<if test="menuName != null and menuName != ''">
-				AND menu_name like concat('%', #{menuName}, '%')
-			</if>
-			<if test="visible != null and visible != ''">
-				AND visible = #{visible}
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-		</where>
-		order by parent_id, order_num
-	</select>
-	
-	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
-		from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
-		order by m.parent_id, m.order_num
-	</select>
-	
-	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
-		from sys_menu m
-		left join sys_role_menu rm on m.menu_id = rm.menu_id
-		left join sys_user_role ur on rm.role_id = ur.role_id
-		left join sys_role ro on ur.role_id = ro.role_id
-		where ur.user_id = #{params.userId}
-		<if test="menuName != null and menuName != ''">
-            AND m.menu_name like concat('%', #{menuName}, '%')
-		</if>
-		<if test="visible != null and visible != ''">
-            AND m.visible = #{visible}
-		</if>
-		<if test="status != null and status != ''">
-            AND m.status = #{status}
-		</if>
-		order by m.parent_id, m.order_num
-	</select>
-    
-    <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
-		from sys_menu m
-			 left join sys_role_menu rm on m.menu_id = rm.menu_id
-			 left join sys_user_role ur on rm.role_id = ur.role_id
-			 left join sys_role ro on ur.role_id = ro.role_id
-			 left join sys_user u on ur.user_id = u.user_id
-		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
-		order by m.parent_id, m.order_num
-	</select>
-	
-	<select id="selectMenuListByRoleId" resultType="Long">
-		select m.menu_id
-		from sys_menu m
-            left join sys_role_menu rm on m.menu_id = rm.menu_id
-        where rm.role_id = #{roleId}
-            <if test="menuCheckStrictly">
-              and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
-            </if>
-		order by m.parent_id, m.order_num
-	</select>
-	
-	<select id="selectMenuPerms" resultType="String">
-		select distinct m.perms
-		from sys_menu m
-			 left join sys_role_menu rm on m.menu_id = rm.menu_id
-			 left join sys_user_role ur on rm.role_id = ur.role_id
-	</select>
-
-	<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
-		select distinct m.perms
-		from sys_menu m
-			 left join sys_role_menu rm on m.menu_id = rm.menu_id
-			 left join sys_user_role ur on rm.role_id = ur.role_id
-			 left join sys_role r on r.role_id = ur.role_id
-		where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
-	</select>
-	
-	<select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
-		select distinct m.perms
-		from sys_menu m
-			 left join sys_role_menu rm on m.menu_id = rm.menu_id
-		where m.status = '0' and rm.role_id = #{roleId}
-	</select>
-	
-	<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
-		<include refid="selectMenuVo"/>
-		where menu_id = #{menuId}
-	</select>
-	
-	<select id="hasChildByMenuId" resultType="Integer">
-	    select count(1) from sys_menu where parent_id = #{menuId}  
-	</select>
-	
-	<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
-		<include refid="selectMenuVo"/>
-		where menu_name=#{menuName} and parent_id = #{parentId} limit 1
-	</select>
-	
-	<update id="updateMenu" parameterType="SysMenu">
-		update sys_menu
-		<set>
-			<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
-			<if test="parentId != null">parent_id = #{parentId},</if>
-			<if test="orderNum != null">order_num = #{orderNum},</if>
-			<if test="path != null and path != ''">path = #{path},</if>
-			<if test="component != null">component = #{component},</if>
-			<if test="query != null">`query` = #{query},</if>
-			<if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
-			<if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
-			<if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
-			<if test="visible != null">visible = #{visible},</if>
-			<if test="status != null">status = #{status},</if>
-			<if test="perms !=null">perms = #{perms},</if>
-			<if test="icon !=null and icon != ''">icon = #{icon},</if>
-			<if test="remark != null and remark != ''">remark = #{remark},</if>
-			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
-			update_time = sysdate()
-		</set>
-		where menu_id = #{menuId}
-	</update>
-
-	<insert id="insertMenu" parameterType="SysMenu">
-		insert into sys_menu(
-		<if test="menuId != null and menuId != 0">menu_id,</if>
-		<if test="parentId != null and parentId != 0">parent_id,</if>
-		<if test="menuName != null and menuName != ''">menu_name,</if>
-		<if test="orderNum != null">order_num,</if>
-		<if test="path != null and path != ''">path,</if>
-		<if test="component != null and component != ''">component,</if>
-		<if test="query != null and query != ''">`query`,</if>
-		<if test="isFrame != null and isFrame != ''">is_frame,</if>
-		<if test="isCache != null and isCache != ''">is_cache,</if>
-		<if test="menuType != null and menuType != ''">menu_type,</if>
-		<if test="visible != null">visible,</if>
-		<if test="status != null">status,</if>
-		<if test="perms !=null and perms != ''">perms,</if>
-		<if test="icon != null and icon != ''">icon,</if>
-		<if test="remark != null and remark != ''">remark,</if>
-		<if test="createBy != null and createBy != ''">create_by,</if>
-		create_time
-		)values(
-		<if test="menuId != null and menuId != 0">#{menuId},</if>
-		<if test="parentId != null and parentId != 0">#{parentId},</if>
-		<if test="menuName != null and menuName != ''">#{menuName},</if>
-		<if test="orderNum != null">#{orderNum},</if>
-		<if test="path != null and path != ''">#{path},</if>
-		<if test="component != null and component != ''">#{component},</if>
-		<if test="query != null and query != ''">#{query},</if>
-		<if test="isFrame != null and isFrame != ''">#{isFrame},</if>
-		<if test="isCache != null and isCache != ''">#{isCache},</if>
-		<if test="menuType != null and menuType != ''">#{menuType},</if>
-		<if test="visible != null">#{visible},</if>
-		<if test="status != null">#{status},</if>
-		<if test="perms !=null and perms != ''">#{perms},</if>
-		<if test="icon != null and icon != ''">#{icon},</if>
-		<if test="remark != null and remark != ''">#{remark},</if>
-		<if test="createBy != null and createBy != ''">#{createBy},</if>
-		sysdate()
-		)
-	</insert>
-	
-	<delete id="deleteMenuById" parameterType="Long">
-	    delete from sys_menu where menu_id = #{menuId}
-	</delete>
-
-</mapper>