易诊通修改

fs-service/src/main/java/com/fs/erp/service/impl/HzOMSErpOrderServiceImpl.java

@@ -57,7 +57,7 @@ public class HzOMSErpOrderServiceImpl implements IErpOrderService {
 
             JSONObject omsOpenPtorderCreate = hzOMSClient.send("oms_open_ptorder_create", hzOrder);
             ErpOrderResponse res = new ErpOrderResponse();
-            res.setCode("hzomssuccess");
+            res.setCode(order.getPlatform_code());
             return res;
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -176,7 +176,7 @@ public class HzOMSErpOrderServiceImpl implements IErpOrderService {
         //订单单号
         obj.put("cptordercode", fsOrder.getOrderCode());
         //平台店铺编码 todo 测试环境只能写死 110111 用于联调测试 fsOrder.getStoreId()
-        obj.put("cptshopcode", 110111);
+        obj.put("cptshopcode", 8080);
         //平台店铺名称
         obj.put("cptshopname", fsStore.getStoreName());
         Integer iorderstatus = null;
@@ -258,11 +258,11 @@ public class HzOMSErpOrderServiceImpl implements IErpOrderService {
         BigDecimal divide = fsOrder.getDiscountMoney().divide(BigDecimal.valueOf(totalOrderItemCount), 2, BigDecimal.ROUND_HALF_UP);
         JSONArray goodArr = new JSONArray();
 
-        fsStoreOrderItems.forEach(fsStoreOrderItem -> {
+        for (FsStoreOrderItem fsStoreOrderItem : fsStoreOrderItems) {
             JSONObject goodItem = new JSONObject();
             //商品编码
             goodItem.put("cptgoodsid", fsStoreOrderItem.getProductId());
-            //商品规格编码 f
+            //商品规格编码
             goodItem.put("cptspeccode", fsStoreOrderItem.getProductAttrValueId());
 
             FsStoreProduct fsStoreProduct = fsStoreProductService.selectFsStoreProductById(fsStoreOrderItem.getProductId());
@@ -289,7 +289,7 @@ public class HzOMSErpOrderServiceImpl implements IErpOrderService {
             //商品条码 f
 //            goodItem.put("cbarcode", "");
             goodArr.add(goodItem);
-        });
+        }
         //订单商品信息
         obj.put("ptorder_goods_list", goodArr);
 

fs-service/src/main/resources/application-druid-yzt.yml

@@ -39,7 +39,7 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://rm-wz9s6kh33ogj852665o.mysql.rds.aliyuncs.com:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://rm-wz9s6kh33ogj852665o.mysql.rds.aliyuncs.com:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&keepAlive=true
                     username: private_domain
                     password: 4+WWnZgXqTj202Q8ZT6
                 # 从库数据源