5-15 库存同步

src/main/java/com/uas/erp/schedular/mall/domain/ProductAvailableQty.java → src/main/java/com/uas/erp/schedular/mall/domain/ProductUpdate.java

@@ -7,7 +7,7 @@ import java.util.Objects;
  * @author zhaoy
  * @create 2019-05-07 18:10
  */
-public class ProductAvailableQty {
+public class ProductUpdate {
 
     private String materialCode; // 物料编号
     private Integer availableQty; // 剩余库存
@@ -28,19 +28,19 @@ public class ProductAvailableQty {
         this.availableQty = availableQty;
     }
 
-    public ProductAvailableQty(String materialCode, Integer availableQty) {
+    public ProductUpdate(String materialCode, Integer availableQty) {
         this.materialCode = materialCode;
         this.availableQty = availableQty;
     }
 
-    public ProductAvailableQty() {
+    public ProductUpdate() {
     }
 
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        ProductAvailableQty that = (ProductAvailableQty) o;
+        ProductUpdate that = (ProductUpdate) o;
         return materialCode.equals(that.materialCode);
     }
 

src/main/java/com/uas/erp/schedular/mall/task/ProductTask.java

@@ -259,14 +259,14 @@ public class ProductTask extends AbstractTask {
         return list;
     }
 
-    private final static String SECRETKEY = "c910666dcf0f4ff8a0398aa68adc5bf3";
-    private final static String SECRETUU = "10044423";
+    private final static String SECRETKEY = "c49f7be6a861461ab951e55030055a5c";
+    private final static String SECRETUU = "50000089";
     private final static String BASEPATH = "https://mallproductrest.uuzcc.cn";
     //private final static String BASEPATH = "http://127.0.0.1:8080";
 
     /**
      * 每天定时计算库存，并按照商城提供的物料清单将对应的库存数据递给商城，商城再去更新对应的产品库存
-     * 默认每天2:00触发
+     * 默认每天3:00触发
      */
     @TaskMapping(title = "库存同步", cron = "0 0 3 * * ?")
     public void getMallProductToErpProduct() throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException {
@@ -297,23 +297,23 @@ public class ProductTask extends AbstractTask {
 
 
             //2.2 取交集
-            List<ProductAvailableQty> productAvailableQty1 = new ArrayList<>();
-            List<ProductAvailableQty> productAvailableQty2 = new ArrayList<>();
+            List<ProductUpdate> productUpdate1 = new ArrayList<>();
+            List<ProductUpdate> productUpdate2 = new ArrayList<>();
             for (int i = 0, len = stock.size(); i < len; i += 1) {
-                productAvailableQty1.add(new ProductAvailableQty(stock.get(i).getTss_prodcode(),stock.get(i).getTss_amount()));
+                productUpdate1.add(new ProductUpdate(stock.get(i).getTss_prodcode(),stock.get(i).getTss_amount()));
             }
             List<Product> productList = pagingQuery.getProduct();
             for (int i = 0, len = productList.size(); i < len; i += 1) {
-                productAvailableQty2.add(new ProductAvailableQty(productList.get(i).getCode(), 0));
+                productUpdate2.add(new ProductUpdate(productList.get(i).getMaterialCode(), 0));
             }
 
-            productAvailableQty1.retainAll(productAvailableQty2);
-            System.out.println(productAvailableQty1);
+            productUpdate1.retainAll(productUpdate2);
+            //System.out.println(JSON.toJSONString(productUpdate1));
 
             JSONObject json = new JSONObject();
             json.put("secretId",SECRETUU);
             json.put("signature", "");
-            json.put("productAvailableQty", JSON.toJSONString(productAvailableQty1));
+            json.put("productUpdate", productUpdate1);
             String signatureValues = OpenApiSignUtil.sign(JSON.toJSONString(json), SECRETKEY);
             json.put("signature",signatureValues);
 
@@ -322,6 +322,7 @@ public class ProductTask extends AbstractTask {
             uriTemplateHandler.setStrictEncoding(true);
             restTemp.setUriTemplateHandler(uriTemplateHandler);
 
+            System.out.println(json.toString());
             String result = restTemp.postForObject(BASEPATH + "/openapi/product/batch/update", json.toString(), String.class);
             JSONObject response = (JSONObject) JSONObject.parse(result);
             System.out.println(response);

src/test/java/com/uas/erp/test/TestProduct.java

@@ -33,11 +33,11 @@ public class TestProduct {
     public void testProduct() throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException {
 
         Master master = new Master();
-        master.setMa_user("T_YHND_HK");
-        master.setMa_uu(10044423L);
-        master.setMa_accesssecret("c910666dcf0f4ff8a0398aa68adc5bf3");
+        master.setMa_user("UAS_TEST");
+        master.setMa_uu(50000089L);
+        master.setMa_accesssecret("c49f7be6a861461ab951e55030055a5c");
         master.setMa_env("test");
-        master.setMa_name("T_YHND_HK");
+        master.setMa_name("UAS_TEST");
 
         ContextHolder.setMaster(master);
         productTask.getMallProductToErpProduct();
@@ -48,11 +48,11 @@ public class TestProduct {
     public void testOrders() throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException {
 
         Master master = new Master();
-        master.setMa_user("T_YHND_HK");
-        master.setMa_uu(10044423L);
-        master.setMa_accesssecret("c910666dcf0f4ff8a0398aa68adc5bf3");
+        master.setMa_user("UAS_TEST");
+        master.setMa_uu(50000089L);
+        master.setMa_accesssecret("c49f7be6a861461ab951e55030055a5c");
         master.setMa_env("test");
-        master.setMa_name("T_YHND_HK");
+        master.setMa_name("UAS_TEST");
 
         ContextHolder.setMaster(master);
         diymallApplyTask.getOrdersByPage();