Merge remote-tracking branch 'origin/master'

fs-company/src/main/java/com/fs/company/controller/live/LiveController.java

@@ -71,7 +71,7 @@ public class LiveController extends BaseController
     {
         startPage();
         List<Live> list = new ArrayList<>();
-        if (CloudHostUtils.hasCloudHostName("济世百康","蒙牛") ) {
+        if (CloudHostUtils.hasCloudHostName("济世百康") ) {
             //直播也发
             list = liveService.listToLiveNoEndNew(live);
         }else{

fs-service/src/main/resources/mapper/his/FsIntegralOrderMapper.xml

@@ -26,10 +26,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="barCode"    column="bar_code"    />
         <result property="loginAccount"    column="login_account"    />
+        <result property="itemCartJson"    column="item_cart_json"    />
+        <result property="integralByCart"    column="integral_by_cart"    />
+        <result property="barCodeCart"    column="bar_code_cart"    />
+        <result property="quantityCart"    column="quantity_cart"    />
     </resultMap>
 
     <sql id="selectFsIntegralOrderVo">
-        select order_id, order_code, user_id,bar_code, user_name, user_phone, user_address, item_json, integral,pay_money,is_pay,pay_time,pay_type, status, delivery_code, delivery_name, delivery_sn, delivery_time, create_time,qw_user_id,company_user_id,company_id,remark,login_account from fs_integral_order
+        select order_id, order_code, user_id,bar_code, user_name, user_phone, user_address, item_json, integral,pay_money,is_pay,pay_time,pay_type, status,
+               delivery_code, delivery_name, delivery_sn, delivery_time, create_time,qw_user_id,company_user_id,company_id,remark,login_account,
+               item_cart_json,integral_by_cart,bar_code_cart,quantity_cart
+        from fs_integral_order
     </sql>
 
     <select id="selectFsIntegralOrderList" parameterType="FsIntegralOrder" resultMap="FsIntegralOrderResult">

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

@@ -340,7 +340,7 @@ public class LiveOrderController extends AppBaseController
         String userId= getUserId();
         log.info("开始创建订单,登录用户id:{}", userId);
         param.setUserId(userId);
-        if(CloudHostUtils.hasCloudHostName("济世百康","蒙牛")){
+        if(CloudHostUtils.hasCloudHostName("济世百康")){
             return  orderService.createLiveOrder(param);
         }else{
             return orderService.createStoreOrder(param);

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 ("live".equals(order[0]) && 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;
                     }