Merge branch '1.0.1' into dev

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbConsInfoFlowMapper.java

@@ -0,0 +1,26 @@
+package com.chaozhanggui.system.cashierservice.dao;
+
+import com.chaozhanggui.system.cashierservice.entity.TbConsInfoFlow;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Mapper
+public interface TbConsInfoFlowMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TbConsInfoFlow record);
+
+    int insertSelective(TbConsInfoFlow record);
+
+    TbConsInfoFlow selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TbConsInfoFlow record);
+
+    int updateByPrimaryKey(TbConsInfoFlow record);
+
+    void insertBatch(@Param("list")List<TbConsInfoFlow> list);
+}

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbConsInfoMapper.java

@@ -0,0 +1,25 @@
+package com.chaozhanggui.system.cashierservice.dao;
+
+import com.chaozhanggui.system.cashierservice.entity.TbConsInfo;
+import com.chaozhanggui.system.cashierservice.entity.po.ConsInfoPO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public interface TbConsInfoMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TbConsInfo record);
+
+    int insertSelective(TbConsInfo record);
+
+    TbConsInfo selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TbConsInfo record);
+
+    int updateByPrimaryKey(TbConsInfo record);
+
+    void batchStock(@Param("list")List<ConsInfoPO> list);
+}

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbCouponCategoryMapper.java

@@ -0,0 +1,17 @@
+package com.chaozhanggui.system.cashierservice.dao;
+
+import com.chaozhanggui.system.cashierservice.entity.TbCouponCategory;
+
+public interface TbCouponCategoryMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TbCouponCategory record);
+
+    int insertSelective(TbCouponCategory record);
+
+    TbCouponCategory selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TbCouponCategory record);
+
+    int updateByPrimaryKey(TbCouponCategory record);
+}

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java

@@ -2,6 +2,7 @@ package com.chaozhanggui.system.cashierservice.dao;
 
 import com.chaozhanggui.system.cashierservice.entity.TbOrderInfo;
 import com.chaozhanggui.system.cashierservice.entity.po.OrderPo;
+import com.chaozhanggui.system.cashierservice.entity.po.SkuInfoPo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -42,4 +43,6 @@ public interface TbOrderInfoMapper {
 
 
     Map<String,String> selectByOrderId(String orderId);
+
+    List<SkuInfoPo> selectSkuByOrderId(String orderId);
 }

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProskuConMapper.java

@@ -0,0 +1,26 @@
+package com.chaozhanggui.system.cashierservice.dao;
+
+import com.chaozhanggui.system.cashierservice.entity.TbProskuCon;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Mapper
+public interface TbProskuConMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TbProskuCon record);
+
+    int insertSelective(TbProskuCon record);
+
+    TbProskuCon selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TbProskuCon record);
+
+    int updateByPrimaryKey(TbProskuCon record);
+
+    List<TbProskuCon> selectBySkuIdAndShopId(@Param("skuId") Integer skuId, @Param("shopId") Integer shopId);
+}

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserInfoMapper.java

@@ -21,4 +21,6 @@ public interface TbUserInfoMapper {
 
     TbUserInfo selectByCardNo(String cardNo);
     TbUserInfo selectByPhone(String phone);
+
+    int selectCountByPhone(String phone);
 }