Merge branch 'lyf' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service into lyf

# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java

src/main/resources/mapper/TbProductMapper.xml

@@ -961,6 +961,7 @@
       <where>
           info.`status`='1'
           AND pro.is_combo = '1'
+          AND pro.type_enum = 'group'
           AND (info.cities = #{cities} or info.districts = #{cities})
           <if test="proName != null and proName != ''">
               AND pro.`name` LIKE concat('%',#{proName,jdbcType=VARCHAR},'%')
@@ -1008,6 +1009,8 @@
     LEFT JOIN tb_shop_info AS info ON info.id =  `order`.shop_id
     <where>
       info.`status`='1'
+      AND pro.is_combo = '1'
+      AND pro.type_enum = 'group'
       AND (info.cities = #{cities} or info.districts = #{cities})
       <if test="proName != null and proName != ''">
         AND  pro.`name` LIKE concat('%',#{proName,jdbcType=VARCHAR},'%')

src/main/resources/mapper/TbProductSkuMapper.xml

@@ -339,7 +339,7 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
     <update id="updateStockById">
-      update tb_product_sku set stock_number = stock_number + #{num} where id = #{skuId}
+      update tb_product_sku set stock_number = stock_number - #{num} where id = #{skuId}
     </update>
   <update id="updateAddStockById">
     update tb_product_sku set stock_number = stock_number + #{num} where id = #{skuId}

src/main/resources/mapper/TbShopUserMapper.xml

@@ -399,7 +399,7 @@
     select * from tb_params where id = 1
   </select>
 
-  <select id="selectByUserId" resultType="java.util.Map">
+  <select id="selectByUserId" resultType="com.chaozhanggui.system.cashierservice.entity.vo.ShopUserListVo">
     SELECT
       u.id as memberId,
       i.id as shopId,
@@ -410,7 +410,7 @@
       u.level_consume as levelConsume,
       u.amount,
       u.`code`,
-      u.is_vip
+      u.is_vip as isVip
     FROM
       tb_shop_user u
         left join tb_shop_info i on u.shop_id=i.id