fix: 支付流程优化

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

@@ -471,10 +471,12 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     storePayment.setPayTypeCode("weixin");
                     storePayment.setBusinessType(2);
                     storePayment.setRemark("商城订单支付");
+                    storePayment.setPayCode(payCode);
                     storePayment.setOpenId(user.getRealName());
                     storePayment.setUserId(user.getUserId());
                     storePayment.setBusinessOrderId(order.getId().toString());
                     storePayment.setOrderId(order.getId());
+                    fsStorePaymentMapper.updateFsStorePayment(storePayment);
                 }
 
                 PayProcessContext processContext = new PayProcessContext();
@@ -3269,6 +3271,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 fsStorePaymentMapper.insertFsStorePayment(storePayment);
             } else {
                 storePayment = fsStorePayments.get(0);
+                storePayment.setPayCode(payCode);
                 storePayment.setPayMoney(order.getPayMoney());
                 storePayment.setCreateTime(new Date());
                 storePayment.setPayTypeCode("weixin");
@@ -3278,6 +3281,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 storePayment.setUserId(user.getUserId());
                 storePayment.setBusinessOrderId(order.getId().toString());
                 storePayment.setOrderId(order.getId());
+                fsStorePaymentMapper.updateFsStorePayment(storePayment);
             }
 
             PaymentHandler payment = PaymentHandlerHolder.findBest(fsPayConfig.getType());

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

@@ -255,7 +255,7 @@ public class StoreOrderController extends  AppBaseController {
         List<FsStorePayment> fsStorePayments = fsStorePaymentService.selectFsStorePaymentByOrderIdNew(order.getId());
         if(CollectionUtils.isNotEmpty(fsStorePayments)){
             FsStorePayment fsStorePayment = fsStorePayments.get(0);
-            if(fsStorePaymentService.queryYb(fsStorePayment)){
+            if(fsStorePaymentService.queryHf(fsStorePayment)){
                 return R.error("当前订单状态不为待支付，请刷新页面!");
             }
         }