he2802 2 anni fa
parent
commit
0e5524c5d6

+ 1 - 1
zhongzheng-admin-saas/src/main/resources/application-pre.yml

@@ -165,7 +165,7 @@ oldOrder:
     refundPayHandle: http://192.168.1.222:6030/common/platform/pay/handle
     refundPayHandle: http://192.168.1.222:6030/common/platform/pay/handle
 
 
 oldSys:
 oldSys:
-    host: http://gdxypx.xy.com
+    host: http://test.jqbao.net
 
 
 invoice:
 invoice:
     host: http://192.168.1.222:8077/sys/common/openMplatform/log
     host: http://192.168.1.222:8077/sys/common/openMplatform/log

+ 1 - 1
zhongzheng-admin/src/main/resources/application-prod.yml

@@ -154,4 +154,4 @@ Nuonuo:
     APPSecret: 07168A248B2844E0
     APPSecret: 07168A248B2844E0
 
 
 oldSys:
 oldSys:
-    host: https://www.xyyxt.net
+    host: http://test.jqbao.net

+ 1 - 1
zhongzheng-api/src/main/resources/application-prod.yml

@@ -166,4 +166,4 @@ Nuonuo:
     APPSecret: 07168A248B2844E0
     APPSecret: 07168A248B2844E0
 
 
 oldSys:
 oldSys:
-    host: https://www.xyyxt.net
+    host: http://test.jqbao.net

+ 11 - 4
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/service/impl/TopOrderRecNoteServiceImpl.java

@@ -23,6 +23,7 @@ import com.zhongzheng.modules.top.order.mapper.TopOrderRecNoteMapper;
 import com.zhongzheng.modules.top.order.service.ITopOrderRecNoteService;
 import com.zhongzheng.modules.top.order.service.ITopOrderRecNoteService;
 import com.zhongzheng.modules.top.order.vo.TopOrderRecNoteVo;
 import com.zhongzheng.modules.top.order.vo.TopOrderRecNoteVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -43,9 +44,14 @@ import java.util.stream.Collectors;
 @Service
 @Service
 public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMapper, TopOrderRecNote> implements ITopOrderRecNoteService {
 public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMapper, TopOrderRecNote> implements ITopOrderRecNoteService {
 
 
+
     @Autowired
     @Autowired
     private ITopOldOrderService iTopOldOrderService;
     private ITopOldOrderService iTopOldOrderService;
 
 
+    @Value("${oldSys.host}")
+    private String OLD_SYS_HOST;
+
+
     @Override
     @Override
     public TopOrderRecNoteVo queryById(Long id){
     public TopOrderRecNoteVo queryById(Long id){
         TopOrderRecNote db = this.baseMapper.selectById(id);
         TopOrderRecNote db = this.baseMapper.selectById(id);
@@ -98,10 +104,11 @@ public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMappe
         add.setCreateTime(DateUtils.getNowTime());
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         if(bo.getNoteType()==1){
         if(bo.getNoteType()==1){
-            pushOldNote(bo.getOrderSn());
-            bo.setLastTime(DateUtils.getNowTime());
+            this.save(add);
+            return pushOldNote(bo.getOrderSn());
+        }else{
+            return this.save(add);
         }
         }
-        return this.save(add);
     }
     }
 
 
     @Override
     @Override
@@ -138,7 +145,7 @@ public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMappe
         params.put("sign", sign);
         params.put("sign", sign);
         params.put("orderNos", orderSn);
         params.put("orderNos", orderSn);
         String respone = "";
         String respone = "";
-        String path = "http://gdxypx.xy.com/WitSystem/BussinessApi/PressMsg";
+        String path = OLD_SYS_HOST+"/WitSystem/BussinessApi/PressMsg";
         try {
         try {
             respone = HttpUtils.postFormBody(path, params);
             respone = HttpUtils.postFormBody(path, params);
             if (!respone.contains("\"Status\":true")) {
             if (!respone.contains("\"Status\":true")) {