Merge branch 'master' of xwh/kmall-pt-general into master

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/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/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/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/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财付通
      */
@@ -1693,4 +1694,50 @@ public class Dict {
             this.itemName = itemName;
         }
     }
+
+
+
+
+
+
+    /**
+     * 操作类型
+     */
+    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;
+        }
+    }
+
+
+
+
+
+
+
+
+
 }