Merge branch 'master' of hyq/cuspay into master

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

@@ -149,6 +149,8 @@ public class WxCusDeclareQueryBiz extends AbstractCusDeclareBiz implements Cuspa
                 errorList.add(wxPayError);
             }
             MerchNoti merchNoti = new MerchNoti();
+            String allSubOrderId = "";
+            String allSubOrderNo = "";
             try {
                 //返回状态码为成功
                 if(WxContants.SUCCESS.equals(wxQueryResponseMsg.getReturnCode())){
@@ -185,7 +187,6 @@ 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());
@@ -193,6 +194,8 @@ public class WxCusDeclareQueryBiz extends AbstractCusDeclareBiz implements Cuspa
                             wxCbPayDoc.setDuty(querySuccessResponseDto.getDuty());
                             wxCbPayDoc.setTransportFee(querySuccessResponseDto.getTransportFee());
                             wxCbPayDoc.setProductFee(querySuccessResponseDto.getProductFee());
+                            allSubOrderId = querySuccessResponseDto.getSubOrderId();
+                            allSubOrderNo = querySuccessResponseDto.getSubOrderNo();
 
                             String state = querySuccessResponseDto.getState();
 
@@ -279,6 +282,8 @@ public class WxCusDeclareQueryBiz extends AbstractCusDeclareBiz implements Cuspa
                 if(mchNotiList != null && mchNotiList.size() > 0){
                     MerchNoti noti = mchNotiList.get(0);
                     noti.setTstm(new Date());
+                    noti.setAllSubOrderId(allSubOrderId);
+                    noti.setAllSubOrderNo(allSubOrderNo);
                     merchNotiService.update(noti);
                 }else{
                     merchNoti.setNotiSn(TablePrimaryKeyPrefix.merch_pay_noti_type + IdWorkerAide.nextId());