Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_java

fs-service/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -4762,7 +4762,8 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
             // 更新商品库存
             fsStoreProductScrmMapper.incStockDecSales(Long.valueOf(liveOrder.getTotalNum()), fsStoreProduct.getProductId());
             goods.setStock(goods.getStock() + Long.parseLong(liveOrder.getTotalNum()));
-            // 更新商品库存
+            goods.setSales(goods.getSales() - Integer.parseInt(liveOrder.getTotalNum()));
+            // 更新直播商品库存
             liveGoodsMapper.updateLiveGoods(goods);
 
             // 退券

fs-user-app/src/main/java/com/fs/app/controller/store/PayScrmController.java

@@ -82,7 +82,7 @@ public class PayScrmController {
             switch (order[0]) {
                 case "store":
                 case "live":
-                    if (CloudHostUtils.hasCloudHostName("济世百康","蒙牛") ) {
+                    if ("live".equals(order[0]) && CloudHostUtils.hasCloudHostName("济世百康","蒙牛")) {
                         liveOrderService.payConfirm(1,null,order[1], o.getHf_seq_id(),o.getOut_trans_id(),o.getParty_order_id());
                         break;
                     }