Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

fs-user-app/src/main/java/com/fs/app/controller/live/LiveOrderController.java

@@ -506,8 +506,8 @@ public class LiveOrderController extends AppBaseController
             else{
                 String config=configService.selectConfigByKey("his.store");
                 StoreConfig storeConfig= JSONUtil.toBean(config,StoreConfig.class);
-                if(param.getPayType().equals(1)){
-                    order.setPayType("1");
+                if(param.getPayType().equals(1)||param.getPayType().equals(99)){
+                    order.setPayType(String.valueOf(param.getPayType()));
                     order.setPayMoney(order.getPayPrice());
                     order.setPayDelivery(BigDecimal.ZERO);
                 }