zyp před 3 týdny
rodič
revize
f8a56803c7

+ 2 - 2
fs-service/src/main/java/com/fs/core/utils/OrderCodeUtils.java

@@ -44,8 +44,8 @@ public class OrderCodeUtils {
 
     }
     public static String getOrderSn(){
-        //String url= FSConfig.getCommonApi()+ "/app/common/genOrderCode";
-        String url= "42.194.245.189:8010/app/common/genOrderCode";
+        String url= FSConfig.getCommonApi()+ "/app/common/genOrderCode";
+//        String url= "42.194.245.189:8010/app/common/genOrderCode";
         String json = HttpRequest.get(url)
                 .execute().body();
         OrderCodeVO vo= JSONUtil.toBean(json, OrderCodeVO.class);

+ 6 - 1
fs-service/src/main/java/com/fs/his/service/impl/FsStorePaymentServiceImpl.java

@@ -550,7 +550,12 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
         TransferBatchesRequest request = new TransferBatchesRequest();
         request.setAppid(config.getAppId());
 
-        String code = IdUtil.getSnowflake(0, 0).nextIdStr();
+        // todo 如果未配置负载均衡请还原原本的单号方式
+//        String code = IdUtil.getSnowflake(0, 0).nextIdStr();
+        String code =  OrderCodeUtils.getOrderSn();
+        if(StringUtils.isEmpty(code)){
+            return R.error("红包单号生成失败,请重试");
+        }
         request.setOutBatchNo("fsCourse" + code);
         request.setBatchRemark("课堂答题奖励");
         request.setBatchName("课堂答题奖励");

+ 1 - 1
fs-service/src/main/resources/application-config-zkzh.yml

@@ -132,7 +132,7 @@ watch:
   password3: v9xsKuqn_$d2y
 
 fs:
-  commonApi: http://172.27.0.7:8010
+  commonApi: http://172.21.76.167:8010
 nuonuo:
   key: 10924508
   secret: A2EB20764D304D16