Merge branch 'master' of hyq/cuspay into master

src/main/java/com/emato/cuspay/biz/wx/WxCusDeclareQueryBiz.java

@@ -185,6 +185,7 @@ public class WxCusDeclareQueryBiz extends AbstractCusDeclareBiz implements Cuspa
                             querySuccessResponseDto = ReaderXmlForDOM4J.parse(result, i);
                             wxCbPayDoc.setSubOrderNo(querySuccessResponseDto.getSubOrderNo());
                             wxCbPayDoc.setSubOrderId(querySuccessResponseDto.getSubOrderId());
+                            merchNoti.setAllSubOrderId(querySuccessResponseDto.getSubOrderId());
                             wxCbPayDoc.setMchCustomsNo(querySuccessResponseDto.getMchCustomsNo());
                             wxCbPayDoc.setCustoms(querySuccessResponseDto.getCustoms());
                             wxCbPayDoc.setFeeType(querySuccessResponseDto.getFeeType());
@@ -280,6 +281,7 @@ public class WxCusDeclareQueryBiz extends AbstractCusDeclareBiz implements Cuspa
                     noti.setTstm(new Date());
                     merchNotiService.update(noti);
                 }else{
+                    merchNoti.setNotiSn(TablePrimaryKeyPrefix.merch_pay_noti_type + IdWorkerAide.nextId());
                     merchNotiService.insert(merchNoti);
                 }
             } catch (Exception e) {

src/main/resources/application.yml

@@ -8,7 +8,7 @@ app:
 
 # 服务配置
 server:
-    address: 120.76.26.84
+    address: 172.18.68.117
     port: 9999
     servlet:
       context-path: /