Merge remote-tracking branch 'origin/master'

fs-service-system/src/main/java/com/fs/store/service/impl/FsStorePaymentServiceImpl.java

@@ -221,7 +221,7 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService
             logger.info("汇付支付参数："+o);
             HuifuCreateOrderResult result = huiFuService.createOrder(o);
             //创建订单
-            if(result.getBank_code()!=null&&result.getBank_code().equals("00000000")){
+            if(result.getResp_code()!=null&&(result.getResp_code().equals("00000000")||result.getResp_code().equals("00000100"))){
                 FsStorePayment mt=new FsStorePayment();
                 mt.setPaymentId(storePayment.getPaymentId());
                 mt.setTradeNo(result.getHf_seq_id());

fs-user-app/src/main/java/com/fs/app/controller/StoreOrderController.java

@@ -409,7 +409,7 @@ public class StoreOrderController extends  AppBaseController {
                     o.setGoodsDesc("商城订单支付");
                     HuifuCreateOrderResult result = huiFuService.createOrder(o);
                     //创建订单
-                    if(result.getBank_code()!=null&&(result.getResp_code().equals("00000000")||result.getResp_code().equals("00000100"))){
+                    if(result.getResp_code()!=null&&(result.getResp_code().equals("00000000")||result.getResp_code().equals("00000100"))){
                         FsStorePayment mt=new FsStorePayment();
                         mt.setPaymentId(storePayment.getPaymentId());
                         mt.setTradeNo(result.getHf_seq_id());
@@ -784,7 +784,7 @@ public class StoreOrderController extends  AppBaseController {
                 o.setGoodsDesc("商城订单尾款支付");
                 HuifuCreateOrderResult result = huiFuService.createOrder(o);
                 //创建订单
-                if(result.getBank_code()!=null&&result.getBank_code().equals("00000000")){
+                if(result.getResp_code()!=null&&(result.getResp_code().equals("00000000")||result.getResp_code().equals("00000100"))){
                     FsStorePayment mt=new FsStorePayment();
                     mt.setPaymentId(storePayment.getPaymentId());
                     mt.setTradeNo(result.getHf_seq_id());
@@ -966,7 +966,7 @@ public class StoreOrderController extends  AppBaseController {
                 o.setTransAmt(storePayment.getPayMoney().toString());
                 o.setGoodsDesc("商城订单支付");
                 HuifuCreateOrderResult result = huiFuService.createOrder(o);
-                if(result.getBank_code()!=null&&result.getBank_code().equals("00000000")){
+                if(result.getResp_code()!=null&&(result.getResp_code().equals("00000000")||result.getResp_code().equals("00000100"))){
                     FsStorePayment mt=new FsStorePayment();
                     mt.setPaymentId(storePayment.getPaymentId());
                     mt.setTradeNo(result.getHf_seq_id());
@@ -1182,7 +1182,7 @@ public class StoreOrderController extends  AppBaseController {
                 o.setTransAmt(storePayment.getPayMoney().toString());
                 o.setGoodsDesc("支付订单尾款");
                 HuifuCreateOrderResult result = huiFuService.createOrder(o);
-                if(result.getBank_code()!=null&&result.getBank_code().equals("00000000")){
+                if(result.getResp_code()!=null&&(result.getResp_code().equals("00000000")||result.getResp_code().equals("00000100"))){
                     FsStorePayment mt=new FsStorePayment();
                     mt.setPaymentId(storePayment.getPaymentId());
                     mt.setTradeNo(result.getHf_seq_id());