Merge branch 'master' of hyq/cuspay into master

src/main/java/com/emato/cuspay/wx/declare/WxCusDeclare.java

@@ -170,13 +170,14 @@ public class WxCusDeclare extends AbstractCusDeclare implements CusDeclare{
                 if (wxResponseMsgDto == null) {
                     throw new IOException("http请求["+declareURL+"]响应结果为空" );
                 }
+
+                wxCbPayDoc.setResultCode(wxResponseMsgDto.getReturnCode());
+                wxCbPayDoc.setReturnCode(wxResponseMsgDto.getReturnCode());
+                wxCbPayDoc.setReturnMsg(wxResponseMsgDto.getReturnMsg());
                 ///返回状态码为失败
                 if (WxContants.RETURN_CODE_FAIL.equals(wxResponseMsgDto.getReturnCode()) ||
                         WxContants.FAIL.equals(wxResponseMsgDto.getReturnCode())) {
-
                     wxCbPayDoc.setDocStatus(WxDict.PaymentDocStatus.i_03.getItem());
-                    wxCbPayDoc.setResultCode(wxResponseMsgDto.getReturnCode());
-                    wxCbPayDoc.setReturnMsg(wxResponseMsgDto.getReturnMsg());
                     wxCbPayDocService.updateWxCbPay(wxCbPayDoc);
 
                     //通知商户
@@ -190,9 +191,6 @@ public class WxCusDeclare extends AbstractCusDeclare implements CusDeclare{
                 //返回这状态码为成功 业务结果成功
                 if (WxContants.SUCCESS.equals(wxResponseMsgDto.getReturnCode())
                             && WxContants.SUCCESS.equals(wxResponseMsgDto.getResultCode())) {
-                    wxCbPayDoc.setReturnCode(wxResponseMsgDto.getReturnCode());
-                    wxCbPayDoc.setReturnMsg(wxResponseMsgDto.getReturnMsg());
-                    wxCbPayDoc.setResultCode(wxResponseMsgDto.getResultCode());
 
                     //订购人与支付人校验结果
                     if (wxResponseMsgDto.getCertCheckResult() != null) {
@@ -207,11 +205,9 @@ public class WxCusDeclare extends AbstractCusDeclare implements CusDeclare{
                         }
                     }
 
-
                     //返回状态未申报
                     if (WxDict.ResponseMsgState.UNDECLARED.getItem().equals(wxResponseMsgDto.getState())) {
                         wxCbPayDoc.setDocStatus(WxDict.PaymentDocStatus.i_01.getItem());
-                        wxCbPayDocService.updateWxCbPay(wxCbPayDoc);
 
                         MerchNoti merchNoti = builder.code(WxContants.ERROR_FAIL)
                                         .msg("未申报")
@@ -223,7 +219,6 @@ public class WxCusDeclare extends AbstractCusDeclare implements CusDeclare{
                     //申报中
                     if (WxDict.ResponseMsgState.PROCESSING.getItem().equals(wxResponseMsgDto.getState())) {
                         wxCbPayDoc.setDocStatus(WxDict.PaymentDocStatus.i_01.getItem());
-                        wxCbPayDocService.updateWxCbPay(wxCbPayDoc);
 
                         MerchNoti merchNoti = builder.code(wxResponseMsgDto.getErrCode())
                                         .msg(wxResponseMsgDto.getErrCodeDes())
@@ -235,7 +230,6 @@ public class WxCusDeclare extends AbstractCusDeclare implements CusDeclare{
                     //申报已提交
                     if (WxDict.ResponseMsgState.SUBMITTED.getItem().equals(wxResponseMsgDto.getState())) {
                         wxCbPayDoc.setDocStatus(WxDict.PaymentDocStatus.i_10.getItem());
-                        wxCbPayDocService.updateWxCbPay(wxCbPayDoc);
 
                         MerchNoti merchNoti = builder.code(wxResponseMsgDto.getErrCode())
                                 .msg(wxResponseMsgDto.getErrCodeDes())
@@ -247,7 +241,6 @@ public class WxCusDeclare extends AbstractCusDeclare implements CusDeclare{
                     //申报成功
                     if (WxDict.ResponseMsgState.SUCCESS.getItem().equals(wxResponseMsgDto.getState())) {
                         wxCbPayDoc.setDocStatus(WxDict.PaymentDocStatus.i_11.getItem());
-                        wxCbPayDocService.updateWxCbPay(wxCbPayDoc);
 
                         MerchNoti merchNoti = builder.code(wxResponseMsgDto.getErrCode())
                                 .msg(wxResponseMsgDto.getErrCodeDes())
@@ -258,8 +251,6 @@ public class WxCusDeclare extends AbstractCusDeclare implements CusDeclare{
                     //申报失败
                     if (WxDict.ResponseMsgState.FAIL.getItem().equals(wxResponseMsgDto.getState())) {
                         wxCbPayDoc.setDocStatus(WxDict.PaymentDocStatus.i_03.getItem());
-                        wxCbPayDocService.updateWxCbPay(wxCbPayDoc);
-
 
                         MerchNoti merchNoti = builder.code(WxContants.ERROR_FAIL)
                                     .msg("海关申报失败")
@@ -270,7 +261,6 @@ public class WxCusDeclare extends AbstractCusDeclare implements CusDeclare{
                     //海关接口异常
                     if (WxDict.ResponseMsgState.EXCEPT.getItem().equals(wxResponseMsgDto.getState())) {
                         wxCbPayDoc.setDocStatus(WxDict.PaymentDocStatus.i_03.getItem());
-                        wxCbPayDocService.updateWxCbPay(wxCbPayDoc);
 
                         MerchNoti merchNoti = builder.code(WxContants.ERROR_EXCEPT)
                                     .msg("海关接口异常")
@@ -278,14 +268,12 @@ public class WxCusDeclare extends AbstractCusDeclare implements CusDeclare{
                                     .build();
                         merchNotis.add(merchNoti);
                     }
-
-
+                    wxCbPayDocService.updateWxCbPay(wxCbPayDoc);
                 }
 
                 //返回状态码为成功 业务结果失败
                 if (WxContants.SUCCESS.equals(wxResponseMsgDto.getReturnCode())
                             && WxContants.FAIL.equals(wxResponseMsgDto.getResultCode())) {
-                    wxCbPayDoc.setResultCode(wxResponseMsgDto.getResultCode());
                     wxCbPayDoc.setErrCode(wxResponseMsgDto.getErrCode());
                     wxCbPayDoc.setErrCodeDes(wxResponseMsgDto.getErrCodeDes());
                     wxCbPayDoc.setDocStatus(WxDict.PaymentDocStatus.i_12.getItem());