Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

 Conflicts:

	kmall-common/src/main/java/com/kmall/common/constant/Dict.java

kmall-admin/src/main/java/com/kmall/admin/controller/GoodsProductController.java

@@ -181,10 +181,10 @@ public class GoodsProductController {
     /**
      * sendSelectProduct
      */
-    @RequestMapping("/sendSelectProduct")
+    @RequestMapping("/sendSelectProductByAdd")
     @ResponseBody
-    public R sendSelectProduct(@RequestBody Integer[]mallGoodsProductSns) {
-        String result = goodsProductService.sendSelectProduct(mallGoodsProductSns);
+    public R sendSelectProductByAdd(@RequestBody Integer[]mallGoodsProductSns) {
+        String result = goodsProductService.sendSelectProduct(mallGoodsProductSns,Dict.operateFlag.item_1.getItem());
         return R.ok(result);
     }
 
@@ -193,18 +193,38 @@ public class GoodsProductController {
     /**
      * sendAllProduct
      */
-    @RequestMapping("/sendAllProduct")
+    @RequestMapping("/sendAllProductByAdd")
     @ResponseBody
-    public R sendAllProduct() {
-        String result = goodsProductService.sendAllProduct();
+    public R sendAllProductByAdd() {
+        String result = goodsProductService.sendAllProduct(Dict.operateFlag.item_1.getItem());
         return R.ok(result);
     }
 
 
 
 
+    /**
+     * sendSelectProduct
+     */
+    @RequestMapping("/sendSelectProductByUpdate")
+    @ResponseBody
+    public R sendSelectProductByUpdate(@RequestBody Integer[]mallGoodsProductSns) {
+        String result = goodsProductService.sendSelectProduct(mallGoodsProductSns,Dict.operateFlag.item_2.getItem());
+        return R.ok(result);
+    }
+
 
 
+    /**
+     * sendAllProduct
+     */
+    @RequestMapping("/sendAllProductByUpdate")
+    @ResponseBody
+    public R sendAllProductByUpdate() {
+        String result = goodsProductService.sendAllProduct(Dict.operateFlag.item_2.getItem());
+        return R.ok(result);
+    }
+
 
 
 

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -45,6 +45,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.Bidi;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -1336,7 +1337,7 @@ public class OrderController {
      * System Format 导出请求
      */
     @RequestMapping(value = "exportSystemFormat")
-    public R exportSystemFormat(@RequestParam Map<String, Object> params, HttpServletResponse response, HttpServletRequest request) {
+    public R exportSystemFormat(@RequestParam Map<String, Object> params, HttpServletResponse response, HttpServletRequest request) throws ParseException {
 
         ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", "thirdPartyMerchCode");
         params = ParamUtils.setTimeMap(params);
@@ -1355,6 +1356,32 @@ public class OrderController {
         list.add(headerMap);
         if (systemFormatList != null && systemFormatList.size() > 0) {
             for (SystemFormatDto systemFormat : systemFormatList) {
+
+                // 如果有退款，获取销售时间的年月和退款时间的年月
+                if (StringUtils.isNotEmpty(systemFormat.getOutRefundNo())){
+                    Date saleDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(systemFormat.getTimeStampDetails());
+                    Date refundDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(systemFormat.getRefundTime());
+                    Calendar saleC = Calendar.getInstance();
+                    saleC.setTime(saleDate);
+                    Calendar refundC = Calendar.getInstance();
+                    refundC.setTime(refundDate);
+                    int saleYear = saleC.get(Calendar.YEAR);// 销售的年
+                    int refundYear = refundC.get(Calendar.YEAR);// 退款的年
+                    int saleMonth = saleC.get(Calendar.MONTH);
+                    int refundMonth = refundC.get(Calendar.MONTH);
+
+                    // 如果是同一年并且销售时间是比退款时间少的话
+                    if (saleMonth<refundMonth && saleYear==refundYear){
+                        systemFormat.setOrderStatus(Dict.orderStatus.item_301.getItem());
+                    }
+                    if (saleYear!= refundYear){
+                        systemFormat.setOrderStatus(Dict.orderStatus.item_301.getItem());
+                    }
+
+
+                }
+
+
                 LinkedHashMap<String, Object> map = new LinkedHashMap<>(32);
                 if (Objects.nonNull(systemFormat.getTaxRate()) && Objects.nonNull(systemFormat.getTotalSalesInclTax())){
 

kmall-admin/src/main/java/com/kmall/admin/controller/StoreTransferInventoryOrderController.java

@@ -0,0 +1,108 @@
+package com.kmall.admin.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.admin.entity.StoreTransferInventoryOrderEntity;
+import com.kmall.admin.service.StoreTransferInventoryOrderService;
+import com.kmall.common.utils.PageUtils;
+import com.kmall.common.utils.Query;
+import com.kmall.common.utils.R;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+
+
+/**
+ * 门店库存转移单表Controller
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2021-03-08 15:43:04
+ */
+@Controller
+@RequestMapping("storetransferinventoryorder")
+public class StoreTransferInventoryOrderController {
+    @Autowired
+    private StoreTransferInventoryOrderService storeTransferInventoryOrderService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("storetransferinventoryorder:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<StoreTransferInventoryOrderEntity> storeTransferInventoryOrderList = storeTransferInventoryOrderService.queryList(query);
+        int total = storeTransferInventoryOrderService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(storeTransferInventoryOrderList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{id}")
+    @RequiresPermissions("storetransferinventoryorder:info")
+    @ResponseBody
+    public R info(@PathVariable("id") Integer id) {
+        StoreTransferInventoryOrderEntity storeTransferInventoryOrder = storeTransferInventoryOrderService.queryObject(id);
+
+        return R.ok().put("storeTransferInventoryOrder", storeTransferInventoryOrder);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("storetransferinventoryorder:save")
+    @ResponseBody
+    public R save(@RequestBody StoreTransferInventoryOrderEntity storeTransferInventoryOrder) {
+        storeTransferInventoryOrderService.save(storeTransferInventoryOrder);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("storetransferinventoryorder:update")
+    @ResponseBody
+    public R update(@RequestBody StoreTransferInventoryOrderEntity storeTransferInventoryOrder) {
+        storeTransferInventoryOrderService.update(storeTransferInventoryOrder);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("storetransferinventoryorder:delete")
+    @ResponseBody
+    public R delete(@RequestBody Integer[]ids) {
+        storeTransferInventoryOrderService.deleteBatch(ids);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<StoreTransferInventoryOrderEntity> list = storeTransferInventoryOrderService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/controller/StoreTransferInventoryOrderDetailController.java

@@ -0,0 +1,107 @@
+package com.kmall.admin.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.common.utils.PageUtils;
+import com.kmall.common.utils.Query;
+import com.kmall.common.utils.R;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity;
+import com.kmall.admin.service.StoreTransferInventoryOrderDetailService;
+
+/**
+ * 门店库存转移单详情表Controller
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2021-03-08 15:43:04
+ */
+@Controller
+@RequestMapping("storetransferinventoryorderdetail")
+public class StoreTransferInventoryOrderDetailController {
+    @Autowired
+    private StoreTransferInventoryOrderDetailService storeTransferInventoryOrderDetailService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("storetransferinventoryorderdetail:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<StoreTransferInventoryOrderDetailEntity> storeTransferInventoryOrderDetailList = storeTransferInventoryOrderDetailService.queryList(query);
+        int total = storeTransferInventoryOrderDetailService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(storeTransferInventoryOrderDetailList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{id}")
+    @RequiresPermissions("storetransferinventoryorderdetail:info")
+    @ResponseBody
+    public R info(@PathVariable("id") Integer id) {
+        StoreTransferInventoryOrderDetailEntity storeTransferInventoryOrderDetail = storeTransferInventoryOrderDetailService.queryObject(id);
+
+        return R.ok().put("storeTransferInventoryOrderDetail", storeTransferInventoryOrderDetail);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("storetransferinventoryorderdetail:save")
+    @ResponseBody
+    public R save(@RequestBody StoreTransferInventoryOrderDetailEntity storeTransferInventoryOrderDetail) {
+        storeTransferInventoryOrderDetailService.save(storeTransferInventoryOrderDetail);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("storetransferinventoryorderdetail:update")
+    @ResponseBody
+    public R update(@RequestBody StoreTransferInventoryOrderDetailEntity storeTransferInventoryOrderDetail) {
+        storeTransferInventoryOrderDetailService.update(storeTransferInventoryOrderDetail);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("storetransferinventoryorderdetail:delete")
+    @ResponseBody
+    public R delete(@RequestBody Integer[]ids) {
+        storeTransferInventoryOrderDetailService.deleteBatch(ids);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<StoreTransferInventoryOrderDetailEntity> list = storeTransferInventoryOrderDetailService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/dao/StoreTransferInventoryOrderDao.java

@@ -0,0 +1,15 @@
+package com.kmall.admin.dao;
+
+import com.kmall.admin.entity.StoreTransferInventoryOrderEntity;
+import com.kmall.manager.dao.BaseDao;
+
+/**
+ * 门店库存转移单表Dao
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2021-03-08 15:43:04
+ */
+public interface StoreTransferInventoryOrderDao extends BaseDao<StoreTransferInventoryOrderEntity> {
+
+}

kmall-admin/src/main/java/com/kmall/admin/dao/StoreTransferInventoryOrderDetailDao.java

@@ -0,0 +1,16 @@
+package com.kmall.admin.dao;
+
+
+import com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity;
+import com.kmall.manager.dao.BaseDao;
+
+/**
+ * 门店库存转移单详情表Dao
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2021-03-08 15:43:04
+ */
+public interface StoreTransferInventoryOrderDetailDao extends BaseDao<StoreTransferInventoryOrderDetailEntity> {
+
+}

kmall-admin/src/main/java/com/kmall/admin/dto/GoodsProductDto.java

@@ -145,6 +145,16 @@ public class GoodsProductDto implements Serializable {
 
     private String prodRecordEname;
 
+    private String operateFlag; // 1、新增 2、修改
+
+    public String getOperateFlag() {
+        return operateFlag;
+    }
+
+    public void setOperateFlag(String operateFlag) {
+        this.operateFlag = operateFlag;
+    }
+
     public String getProdRecordName() {
         return prodRecordName;
     }

kmall-admin/src/main/java/com/kmall/admin/dto/SystemFormatDto.java

@@ -48,6 +48,25 @@ public class SystemFormatDto implements Serializable {
 
     private String taxPrice; // 税费
 
+    private String outRefundNo;//退款订单号
+
+    private String refundTime;//退款时间
+
+    public String getOutRefundNo() {
+        return outRefundNo;
+    }
+
+    public void setOutRefundNo(String outRefundNo) {
+        this.outRefundNo = outRefundNo;
+    }
+
+    public String getRefundTime() {
+        return refundTime;
+    }
+
+    public void setRefundTime(String refundTime) {
+        this.refundTime = refundTime;
+    }
 
     public String getOrderStatus() {
         return orderStatus;

kmall-admin/src/main/java/com/kmall/admin/entity/StoreTransferInventoryOrderDetailEntity.java

@@ -0,0 +1,154 @@
+package com.kmall.admin.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 门店库存转移单详情表实体
+ * 表名 mall_store_transfer_inventory_order_detail
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2021-03-08 15:43:04
+ */
+public class StoreTransferInventoryOrderDetailEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 门店转移单详情id
+     */
+    private Integer id;
+    /**
+     * 门店转移单id
+     */
+    private Integer orderId;
+    /**
+     * 转移商品sku
+     */
+    private String sku;
+    /**
+     * 转移商品数量
+     */
+    private Integer num;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 创建人
+     */
+    private String createSn;
+    /**
+     * 修改时间
+     */
+    private Date modifyTime;
+    /**
+     * 修改人
+     */
+    private String modifySn;
+
+    /**
+     * 设置：门店转移单详情id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取：门店转移单详情id
+     */
+    public Integer getId() {
+        return id;
+    }
+    /**
+     * 设置：门店转移单id
+     */
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
+    }
+
+    /**
+     * 获取：门店转移单id
+     */
+    public Integer getOrderId() {
+        return orderId;
+    }
+    /**
+     * 设置：转移商品sku
+     */
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
+
+    /**
+     * 获取：转移商品sku
+     */
+    public String getSku() {
+        return sku;
+    }
+    /**
+     * 设置：转移商品数量
+     */
+    public void setNum(Integer num) {
+        this.num = num;
+    }
+
+    /**
+     * 获取：转移商品数量
+     */
+    public Integer getNum() {
+        return num;
+    }
+    /**
+     * 设置：备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    /**
+     * 获取：备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+    /**
+     * 设置：创建人
+     */
+    public void setCreateSn(String createSn) {
+        this.createSn = createSn;
+    }
+
+    /**
+     * 获取：创建人
+     */
+    public String getCreateSn() {
+        return createSn;
+    }
+    /**
+     * 设置：修改时间
+     */
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    /**
+     * 获取：修改时间
+     */
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+    /**
+     * 设置：修改人
+     */
+    public void setModifySn(String modifySn) {
+        this.modifySn = modifySn;
+    }
+
+    /**
+     * 获取：修改人
+     */
+    public String getModifySn() {
+        return modifySn;
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/entity/StoreTransferInventoryOrderEntity.java

@@ -0,0 +1,239 @@
+package com.kmall.admin.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 门店库存转移单表实体
+ * 表名 mall_store_transfer_inventory_order
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2021-03-08 15:43:04
+ */
+public class StoreTransferInventoryOrderEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 门店转移单id
+     */
+    private Integer id;
+    /**
+     * 商户编号
+     */
+    private String merchSn;
+    /**
+     * 商户名称
+     */
+    private String merchName;
+    /**
+     * 转入门店编号
+     */
+    private String inStoreSn;
+    /**
+     * 转入门店名称
+     */
+    private String inStoreName;
+    /**
+     * 转出门店编号
+     */
+    private String outStoreSn;
+    /**
+     * 转出门店名称
+     */
+    private String outStoreName;
+    /**
+     * 状态 0：未转移 1：转移成功 2：转移失败
+     */
+    private Integer status;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 创建人
+     */
+    private String createSn;
+    /**
+     * 修改时间
+     */
+    private Date modifyTime;
+    /**
+     * 修改人
+     */
+    private String modifySn;
+
+    /**
+     * 设置：门店转移单id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取：门店转移单id
+     */
+    public Integer getId() {
+        return id;
+    }
+    /**
+     * 设置：商户编号
+     */
+    public void setMerchSn(String merchSn) {
+        this.merchSn = merchSn;
+    }
+
+    /**
+     * 获取：商户编号
+     */
+    public String getMerchSn() {
+        return merchSn;
+    }
+    /**
+     * 设置：商户名称
+     */
+    public void setMerchName(String merchName) {
+        this.merchName = merchName;
+    }
+
+    /**
+     * 获取：商户名称
+     */
+    public String getMerchName() {
+        return merchName;
+    }
+    /**
+     * 设置：转入门店编号
+     */
+    public void setInStoreSn(String inStoreSn) {
+        this.inStoreSn = inStoreSn;
+    }
+
+    /**
+     * 获取：转入门店编号
+     */
+    public String getInStoreSn() {
+        return inStoreSn;
+    }
+    /**
+     * 设置：转入门店名称
+     */
+    public void setInStoreName(String inStoreName) {
+        this.inStoreName = inStoreName;
+    }
+
+    /**
+     * 获取：转入门店名称
+     */
+    public String getInStoreName() {
+        return inStoreName;
+    }
+    /**
+     * 设置：转出门店编号
+     */
+    public void setOutStoreSn(String outStoreSn) {
+        this.outStoreSn = outStoreSn;
+    }
+
+    /**
+     * 获取：转出门店编号
+     */
+    public String getOutStoreSn() {
+        return outStoreSn;
+    }
+    /**
+     * 设置：转出门店名称
+     */
+    public void setOutStoreName(String outStoreName) {
+        this.outStoreName = outStoreName;
+    }
+
+    /**
+     * 获取：转出门店名称
+     */
+    public String getOutStoreName() {
+        return outStoreName;
+    }
+    /**
+     * 设置：状态 0：未转移 1：转移成功 2：转移失败
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取：状态 0：未转移 1：转移成功 2：转移失败
+     */
+    public Integer getStatus() {
+        return status;
+    }
+    /**
+     * 设置：备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    /**
+     * 获取：备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+    /**
+     * 设置：创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+    /**
+     * 设置：创建人
+     */
+    public void setCreateSn(String createSn) {
+        this.createSn = createSn;
+    }
+
+    /**
+     * 获取：创建人
+     */
+    public String getCreateSn() {
+        return createSn;
+    }
+    /**
+     * 设置：修改时间
+     */
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    /**
+     * 获取：修改时间
+     */
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+    /**
+     * 设置：修改人
+     */
+    public void setModifySn(String modifySn) {
+        this.modifySn = modifySn;
+    }
+
+    /**
+     * 获取：修改人
+     */
+    public String getModifySn() {
+        return modifySn;
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/service/GoodsProductService.java

@@ -74,8 +74,8 @@ public interface GoodsProductService {
 
     void uploadExcel(List<GoodsProductDto> goodsProductDtoList);
 
-    String sendSelectProduct(Integer[] mallGoodsProductSns);
+    String sendSelectProduct(Integer[] mallGoodsProductSns,String operateFlag);
 
-    String sendAllProduct();
+    String sendAllProduct(String operateFlag);
 
 }

kmall-admin/src/main/java/com/kmall/admin/service/StoreTransferInventoryOrderDetailService.java

@@ -0,0 +1,73 @@
+package com.kmall.admin.service;
+
+
+import com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 门店库存转移单详情表Service接口
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2021-03-08 15:43:04
+ */
+public interface StoreTransferInventoryOrderDetailService {
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param id 主键
+     * @return 实体
+     */
+    StoreTransferInventoryOrderDetailEntity queryObject(Integer id);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<StoreTransferInventoryOrderDetailEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param storeTransferInventoryOrderDetail 实体
+     * @return 保存条数
+     */
+    int save(StoreTransferInventoryOrderDetailEntity storeTransferInventoryOrderDetail);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param storeTransferInventoryOrderDetail 实体
+     * @return 更新条数
+     */
+    int update(StoreTransferInventoryOrderDetailEntity storeTransferInventoryOrderDetail);
+
+    /**
+     * 根据主键删除
+     *
+     * @param id
+     * @return 删除条数
+     */
+    int delete(Integer id);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param ids
+     * @return 删除条数
+     */
+    int deleteBatch(Integer[]ids);
+}

kmall-admin/src/main/java/com/kmall/admin/service/StoreTransferInventoryOrderService.java

@@ -0,0 +1,72 @@
+package com.kmall.admin.service;
+
+import com.kmall.admin.entity.StoreTransferInventoryOrderEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 门店库存转移单表Service接口
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2021-03-08 15:43:04
+ */
+public interface StoreTransferInventoryOrderService {
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param id 主键
+     * @return 实体
+     */
+    StoreTransferInventoryOrderEntity queryObject(Integer id);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<StoreTransferInventoryOrderEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param storeTransferInventoryOrder 实体
+     * @return 保存条数
+     */
+    int save(StoreTransferInventoryOrderEntity storeTransferInventoryOrder);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param storeTransferInventoryOrder 实体
+     * @return 更新条数
+     */
+    int update(StoreTransferInventoryOrderEntity storeTransferInventoryOrder);
+
+    /**
+     * 根据主键删除
+     *
+     * @param id
+     * @return 删除条数
+     */
+    int delete(Integer id);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param ids
+     * @return 删除条数
+     */
+    int deleteBatch(Integer[]ids);
+}

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsProductServiceImpl.java

@@ -11,6 +11,7 @@ import com.kmall.admin.utils.OkHttpUtils;
 import com.kmall.admin.utils.ShiroUtils;
 import com.kmall.admin.utils.data.response.ResponseMessage;
 import com.kmall.admin.utils.oms.OmsSign;
+import com.kmall.common.constant.Dict;
 import com.kmall.common.utils.RRException;
 import com.kmall.manager.manager.merch.OmsMerchProperties;
 import okhttp3.Request;
@@ -170,7 +171,7 @@ public class GoodsProductServiceImpl implements GoodsProductService {
 
     @Override
     @Transactional
-    public String sendSelectProduct(Integer[] mallGoodsProductSns) {
+    public String sendSelectProduct(Integer[] mallGoodsProductSns,String operateFlag) {
         List<GoodsProductEntity> goodsProductEntityList = goodsProductDao.selectByMallGoodsProductSns(mallGoodsProductSns);
         List<GoodsProductDto> goodsProductDtoList = new ArrayList<>();
         for (GoodsProductEntity goodsProductEntity : goodsProductEntityList) {
@@ -181,6 +182,7 @@ public class GoodsProductServiceImpl implements GoodsProductService {
             dto.setNetWeight(goodsProductEntity.getNetWeight().toString());
             dto.setGrossWeight(goodsProductEntity.getGrossWeight().toString());
             dto.setDeclPrice(goodsProductEntity.getDeclPrice().toString());
+            dto.setOperateFlag(operateFlag);
             goodsProductDtoList.add(dto);
         }
         try {
@@ -196,7 +198,7 @@ public class GoodsProductServiceImpl implements GoodsProductService {
 
     @Override
     @Transactional
-    public String sendAllProduct() {
+    public String sendAllProduct(String operateFlag) {
         List<GoodsProductEntity> goodsProductEntityList = goodsProductDao.queryList(new HashMap<>());// 查询所有
         if (goodsProductEntityList == null || goodsProductEntityList.size()==0){
             return "无数据，请添加数据";
@@ -210,6 +212,7 @@ public class GoodsProductServiceImpl implements GoodsProductService {
             dto.setNetWeight(goodsProductEntity.getNetWeight().toString());
             dto.setGrossWeight(goodsProductEntity.getGrossWeight().toString());
             dto.setDeclPrice(goodsProductEntity.getDeclPrice().toString());
+            dto.setOperateFlag(operateFlag);
             goodsProductDtoList.add(dto);
         }
         try {

kmall-admin/src/main/java/com/kmall/admin/service/impl/StoreTransferInventoryOrderDetailServiceImpl.java

@@ -0,0 +1,59 @@
+package com.kmall.admin.service.impl;
+
+import com.kmall.admin.dao.StoreTransferInventoryOrderDetailDao;
+import com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity;
+import com.kmall.admin.service.StoreTransferInventoryOrderDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 门店库存转移单详情表Service实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2021-03-08 15:43:04
+ */
+@Service("storeTransferInventoryOrderDetailService")
+public class StoreTransferInventoryOrderDetailServiceImpl implements StoreTransferInventoryOrderDetailService {
+    @Autowired
+    private StoreTransferInventoryOrderDetailDao storeTransferInventoryOrderDetailDao;
+
+    @Override
+    public StoreTransferInventoryOrderDetailEntity queryObject(Integer id) {
+        return storeTransferInventoryOrderDetailDao.queryObject(id);
+    }
+
+    @Override
+    public List<StoreTransferInventoryOrderDetailEntity> queryList(Map<String, Object> map) {
+        return storeTransferInventoryOrderDetailDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return storeTransferInventoryOrderDetailDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(StoreTransferInventoryOrderDetailEntity storeTransferInventoryOrderDetail) {
+        return storeTransferInventoryOrderDetailDao.save(storeTransferInventoryOrderDetail);
+    }
+
+    @Override
+    public int update(StoreTransferInventoryOrderDetailEntity storeTransferInventoryOrderDetail) {
+        return storeTransferInventoryOrderDetailDao.update(storeTransferInventoryOrderDetail);
+    }
+
+    @Override
+    public int delete(Integer id) {
+        return storeTransferInventoryOrderDetailDao.delete(id);
+    }
+
+    @Override
+    public int deleteBatch(Integer[]ids) {
+        return storeTransferInventoryOrderDetailDao.deleteBatch(ids);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/service/impl/StoreTransferInventoryOrderServiceImpl.java

@@ -0,0 +1,59 @@
+package com.kmall.admin.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.admin.dao.StoreTransferInventoryOrderDao;
+import com.kmall.admin.entity.StoreTransferInventoryOrderEntity;
+import com.kmall.admin.service.StoreTransferInventoryOrderService;
+
+/**
+ * 门店库存转移单表Service实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2021-03-08 15:43:04
+ */
+@Service("storeTransferInventoryOrderService")
+public class StoreTransferInventoryOrderServiceImpl implements StoreTransferInventoryOrderService {
+    @Autowired
+    private StoreTransferInventoryOrderDao storeTransferInventoryOrderDao;
+
+    @Override
+    public StoreTransferInventoryOrderEntity queryObject(Integer id) {
+        return storeTransferInventoryOrderDao.queryObject(id);
+    }
+
+    @Override
+    public List<StoreTransferInventoryOrderEntity> queryList(Map<String, Object> map) {
+        return storeTransferInventoryOrderDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return storeTransferInventoryOrderDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(StoreTransferInventoryOrderEntity storeTransferInventoryOrder) {
+        return storeTransferInventoryOrderDao.save(storeTransferInventoryOrder);
+    }
+
+    @Override
+    public int update(StoreTransferInventoryOrderEntity storeTransferInventoryOrder) {
+        return storeTransferInventoryOrderDao.update(storeTransferInventoryOrder);
+    }
+
+    @Override
+    public int delete(Integer id) {
+        return storeTransferInventoryOrderDao.delete(id);
+    }
+
+    @Override
+    public int deleteBatch(Integer[]ids) {
+        return storeTransferInventoryOrderDao.deleteBatch(ids);
+    }
+}

kmall-admin/src/main/resources/mybatis/mapper/OrderDao.xml

@@ -2075,7 +2075,9 @@
         '专柜单品' as productCategory,
         sup.child_supplier_name as supplierName,
         o.order_status as orderStatus,
-        g.tax_price as taxPrice
+        g.tax_price as taxPrice,
+        mor.out_refund_no as outRefundNo,
+        mor.create_time as refundTime
         FROM
         mall_order o
         LEFT JOIN mall_order_goods g ON o.id = g.order_id
@@ -2087,6 +2089,7 @@
         left join mall_product_store_rela sr on sr.goods_id=gs.id
         left join mall_brand b on b.id=sr.brand_id
         left join mall_supplier sup on gs.supplier_id = sup.id
+        left join mall_order_refund mor on mor.out_refund_no = o.order_sn
         WHERE 1=1
         <if test="orderSn != null and orderSn.trim() != ''">
             AND o.order_sn LIKE concat('%',#{orderSn},'%')

kmall-admin/src/main/webapp/WEB-INF/page/shop/goodsproduct.html

@@ -25,8 +25,11 @@
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
             <div class="buttons-group">
-                <i-button type="info" @click="sendSelectProduct"><i class="fa fa-plus"></i>&nbsp;选中发送</i-button>
-                <i-button type="info" @click="sendAllProduct"><i class="fa fa-plus"></i>&nbsp;全部发送</i-button>
+                <i-button type="info" @click="sendSelectProductByAdd"><i class="fa fa-plus"></i>&nbsp;选中发送(新增)</i-button>
+                <i-button type="info" @click="sendAllProductByAdd"><i class="fa fa-plus"></i>&nbsp;全部发送(新增)</i-button>
+                <i-button type="info" @click="sendSelectProductByUpdate"><i class="fa fa-plus"></i>&nbsp;选中发送(修改)</i-button>
+                <i-button type="info" @click="sendAllProductByUpdate"><i class="fa fa-plus"></i>&nbsp;全部发送(修改)</i-button>
+
                 #if($shiro.hasPermission("goodsproduct:save"))
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 #end

kmall-admin/src/main/webapp/js/shop/goodsproduct.js

@@ -242,7 +242,7 @@ let vm = new Vue({
 			});
 			setTimeout(exportMsg, 100);
 		},
-		sendSelectProduct: function (event) {
+		sendSelectProductByAdd: function (event) {
 			let mallGoodsProductSns = getSelectedRows();
 			if (mallGoodsProductSns == null){
 				return;
@@ -251,7 +251,7 @@ let vm = new Vue({
 			confirm('确定要发送选中的产品备案信息？', function () {
 				$.ajax({
 					type: "POST",
-					url: "../goodsproduct/sendSelectProduct",
+					url: "../goodsproduct/sendSelectProductByAdd",
 					contentType: "application/json",
 					data: JSON.stringify(mallGoodsProductSns),
 					success: function (r) {
@@ -266,12 +266,56 @@ let vm = new Vue({
 				});
 			});
 		},
-		sendAllProduct: function (event) {
+		sendAllProductByAdd: function (event) {
 
 			confirm('确定要发送所有的产品备案信息？', function () {
 				$.ajax({
 					type: "POST",
-					url: "../goodsproduct/sendAllProduct",
+					url: "../goodsproduct/sendAllProductByAdd",
+					contentType: "application/json",
+					success: function (r) {
+						if (r.code == 0) {
+							alert(r.msg, function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+
+		sendSelectProductByUpdate: function (event) {
+			let mallGoodsProductSns = getSelectedRows();
+			if (mallGoodsProductSns == null){
+				return;
+			}
+
+			confirm('确定要发送选中的产品备案信息？', function () {
+				$.ajax({
+					type: "POST",
+					url: "../goodsproduct/sendSelectProductByUpdate",
+					contentType: "application/json",
+					data: JSON.stringify(mallGoodsProductSns),
+					success: function (r) {
+						if (r.code == 0) {
+							alert(r.msg, function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		sendAllProductByUpdate: function (event) {
+
+			confirm('确定要发送所有的产品备案信息？', function () {
+				$.ajax({
+					type: "POST",
+					url: "../goodsproduct/sendAllProductByUpdate",
 					contentType: "application/json",
 					success: function (r) {
 						if (r.code == 0) {

kmall-common/src/main/java/com/kmall/common/constant/Dict.java

@@ -7,6 +7,7 @@ package com.kmall.common.constant;
  */
 public class Dict {
 
+
     /**
      * 支付方式，weixin:微信;alipay:支付宝;tenpay:QQ财付通
      */
@@ -1694,6 +1695,52 @@ public class Dict {
         }
     }
 
+
+
+
+
+
+    /**
+     * 操作类型
+     */
+    public enum operateFlag {
+        item_1("1", "新增"),
+        item_2("2", "修改");
+
+        private String item;
+        private String itemName;
+
+        operateFlag(String item, String itemName) {
+            this.item = item;
+            this.itemName = itemName;
+        }
+
+        public String getItem() {
+            return item;
+        }
+
+        public void setItem(String item) {
+            this.item = item;
+        }
+
+        public String getItemName() {
+            return itemName;
+        }
+
+        public void setItemName(String itemName) {
+            this.itemName = itemName;
+        }
+    }
+
+
+
+
+
+
+
+
+
+
     /**
      * 转移类型
      */