测试环境URL调整

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

@@ -49,7 +49,7 @@ import java.util.Map;
 @TaskMapping(title = "商城订单")
 public class OrderTask extends AbstractTask {
 
-    private static final String BASEPATH_TRADE = "https://malltraderest.usoftchina.com";
+    private static String BASEPATH_TRADE = "https://malltraderest.usoftchina.com";
     //private static final String BASEPATH_TRADE = "https://malltraderest.uuzcc.cn";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OrderTask.class);
@@ -57,6 +57,9 @@ public class OrderTask extends AbstractTask {
     @TaskMapping(title = "上传出货单过账状态到商城", cron = "0 0 1 * * ?")
     public void uploadPoststatus() throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException {
         Master master = ContextHolder.getMaster();
+        if ("test".equalsIgnoreCase(master.getEnv())) {
+            BASEPATH_TRADE = "https://malltraderest.uuzcc.cn";
+        }
         //获取需要上传的数据
         List<OrderDeliver> orderDeliverList = jdbcTemplate.queryForBeanList("SELECT distinct SA_POCODE as orderCode,TRIM(',' FROM SA_EXPRESSCODE_USER) AS expressCode,TRIM(',' FROM SA_EXPRESSINC_USER) AS expressInc FROM SALE WHERE NVL(SA_SENDPOSTSTATUS,' ') = '待上传' AND SA_KIND = '商城订单'", OrderDeliver.class);
         if (!CollectionUtils.isEmpty(orderDeliverList)) {
@@ -99,6 +102,10 @@ public class OrderTask extends AbstractTask {
 
     @TaskMapping(title = "下载已过账销售订单,生成采购/销售/入库/出货单据", cron = "0 0 1 * * ?")
     public void downloadOrder() throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException {
+        Master master = ContextHolder.getMaster();
+        if ("test".equalsIgnoreCase(master.getEnv())) {
+            BASEPATH_TRADE = "https://malltraderest.uuzcc.cn";
+        }
         String url = BASEPATH_TRADE + "/openapi/trade/order/page/get?";
         Long updateTime = System.currentTimeMillis() - 24 * 60 * 60 * 1000;
         //获取需要生成数据的供应商

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

@@ -10,11 +10,13 @@ import com.uas.erp.schedular.diymall.domain.OrdersInfo;
 import com.uas.erp.schedular.diymall.domain.LoggingOrder;
 import com.uas.erp.schedular.diymall.domain.Order;
 import com.uas.erp.schedular.diymall.domain.OrderProduct;
+import com.uas.erp.schedular.entity.Master;
 import com.uas.erp.schedular.finance.mq.HttpsClientRequestFactory;
 import com.uas.erp.schedular.mall.constant.StringConstant;
 import com.uas.erp.schedular.mall.domain.*;
 import com.uas.erp.schedular.task.support.Method;
 import com.uas.erp.schedular.task.support.TaskMapping;
+import com.uas.erp.schedular.util.ContextHolder;
 import com.usoft.security.utils.OpenApiSignUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -270,10 +272,10 @@ public class ProductTask extends AbstractTask {
         return list;
     }
 
-    private final static String SECRETKEY = "58177a621f4645398c92e93768002de7";
-    private final static String SECRETUU = "10044412";
-    private final static String BASEPATH_PRODUCT = "https://mallproductrest.usoftchina.com";
-    private final static String BASEPATH_TRADE = "https://malltraderest.usoftchina.com";
+    private static String SECRETKEY = "58177a621f4645398c92e93768002de7";
+    private static String SECRETUU = "10044412";
+    private static String BASEPATH_PRODUCT = "https://mallproductrest.usoftchina.com";
+    private static String BASEPATH_TRADE = "https://malltraderest.usoftchina.com";
 
 //    private final static String SECRETKEY = "c49f7be6a861461ab951e55030055a5c";
 //    private final static String SECRETUU = "50000089";
@@ -287,6 +289,10 @@ public class ProductTask extends AbstractTask {
      */
     @TaskMapping(title = "库存同步", cron = "0 0 3 * * ?")
     public void getMallProductToErpProduct() throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException {
+        Master master = ContextHolder.getMaster();
+        if ("test".equalsIgnoreCase(master.getEnv())) {
+            BASEPATH_PRODUCT = "https://mallproductrest.uuzcc.cn";
+        }
         //查询中间表 库存取整
         List<Stock> stock = jdbcTemplate.queryForBeanList("select TSS_PRODCODE,round(tss_amount,0) tss_amount, TSS_DATE ,pr_zxdhl moq,pr_zxbzs mpq,getsaleprice_hkd(pr_code) price,pr_remark_sale invoiceModel,pr_remark_purchase invoiceName" +
                 " FROM TT_SHOP_STOCK LEFT JOIN PRODUCT ON TSS_PRODCODE=pr_code",Stock.class);
@@ -377,7 +383,10 @@ public class ProductTask extends AbstractTask {
      */
     @TaskMapping(title = "订单同步", cron = "0 0 2 * * ?")
     public void getOrdersByPage() throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException {
-
+        Master master = ContextHolder.getMaster();
+        if ("test".equalsIgnoreCase(master.getEnv())) {
+            BASEPATH_TRADE = "https://malltraderest.uuzcc.cn";
+        }
         String url = BASEPATH_TRADE + "/openapi/trade/order/page/get?";
         String materialCod = ""; // 物料编号
         Long updateTime = new Date().getTime()-24*60*60*1000; // 数据修改时间 时间戳