Merge remote-tracking branch 'origin/yhq' into lyf

# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbSystemCoupons.java
#	src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitConfig.java
#	src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitProducer.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
#	src/main/java/com/chaozhanggui/system/cashierservice/util/RandomUtil.java
#	src/main/resources/application-dev.yml
#	src/main/resources/application-dev2.yml
#	src/main/resources/application-prod.yml
#	src/main/resources/application-prod2.yml
#	src/main/resources/mapper/TbShopInfoMapper.xml

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

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

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

@@ -0,0 +1,23 @@
+package com.chaozhanggui.system.cashierservice.dao;
+
+import com.chaozhanggui.system.cashierservice.entity.TbIntegral;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public interface TbIntegralMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TbIntegral record);
+
+    int insertSelective(TbIntegral record);
+
+    TbIntegral selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TbIntegral record);
+
+    int updateByPrimaryKey(TbIntegral record);
+
+    List<TbIntegral> selectAllByUserId(String userId);
+}

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

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Component
@@ -32,5 +33,5 @@ public interface TbOrderInfoMapper {
                                      @Param("size")Integer size, @Param("status") String status);
 
 
-
+    List<TbOrderInfo> selectByTradeDay(@Param("day") String day,@Param("minPrice")  BigDecimal minPrice,@Param("maxPrice")  BigDecimal maxPrice);
 }

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

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

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

@@ -0,0 +1,24 @@
+package com.chaozhanggui.system.cashierservice.dao;
+
+import com.chaozhanggui.system.cashierservice.entity.TbReleaseFlow;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface TbReleaseFlowMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TbReleaseFlow record);
+
+    int insertSelective(TbReleaseFlow record);
+
+    TbReleaseFlow selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TbReleaseFlow record);
+
+    int updateByPrimaryKey(TbReleaseFlow record);
+
+    List<TbReleaseFlow> selectByUserId(@Param("userId") String userId);
+
+    List<TbReleaseFlow> selectAll();
+}

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

@@ -1,5 +1,6 @@
 package com.chaozhanggui.system.cashierservice.dao;
 
+import com.chaozhanggui.system.cashierservice.entity.TbParams;
 import com.chaozhanggui.system.cashierservice.entity.TbShopUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -25,4 +26,8 @@ public interface TbShopUserMapper {
 
 
     TbShopUser selectByUserId(@Param("userId") String userId);
+
+    TbShopUser selectByOpenId(@Param("openId") String openId);
+
+    TbParams selectParams();
 }

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

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

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

@@ -0,0 +1,22 @@
+package com.chaozhanggui.system.cashierservice.dao;
+
+import com.chaozhanggui.system.cashierservice.entity.TbSystemCoupons;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface TbSystemCouponsMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TbSystemCoupons record);
+
+    int insertSelective(TbSystemCoupons record);
+
+    TbSystemCoupons selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TbSystemCoupons record);
+
+    int updateByPrimaryKey(TbSystemCoupons record);
+
+    List<TbSystemCoupons> selectAll(@Param("type") String type);
+}

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

@@ -0,0 +1,28 @@
+package com.chaozhanggui.system.cashierservice.dao;
+
+import com.chaozhanggui.system.cashierservice.entity.TbUserCoupons;
+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 TbUserCouponsMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TbUserCoupons record);
+
+    int insertSelective(TbUserCoupons record);
+
+    TbUserCoupons selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TbUserCoupons record);
+
+    int updateByPrimaryKey(TbUserCoupons record);
+
+    List<TbUserCoupons> selectByUserId(@Param("userId") String userId,@Param("status")  String status);
+
+    TbUserCoupons selectByOrderId(@Param("orderId") Integer orderId);
+}

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

@@ -4,6 +4,8 @@ import com.chaozhanggui.system.cashierservice.entity.TbUserInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 @Component
 @Mapper
 public interface TbUserInfoMapper {
@@ -38,4 +40,5 @@ public interface TbUserInfoMapper {
     TbUserInfo selectByPhone(String phone);
 
 
+    List<TbUserInfo> selectAll();
 }

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

@@ -0,0 +1,21 @@
+package com.chaozhanggui.system.cashierservice.dao;
+
+import com.chaozhanggui.system.cashierservice.entity.TbWiningParams;
+
+import java.util.List;
+
+public interface TbWiningParamsMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TbWiningParams record);
+
+    int insertSelective(TbWiningParams record);
+
+    TbWiningParams selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TbWiningParams record);
+
+    int updateByPrimaryKey(TbWiningParams record);
+
+    List<TbWiningParams> selectAll();
+}

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

@@ -0,0 +1,26 @@
+package com.chaozhanggui.system.cashierservice.dao;
+
+import com.chaozhanggui.system.cashierservice.entity.TbWiningUser;
+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 TbWiningUserMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TbWiningUser record);
+
+    int insertSelective(TbWiningUser record);
+
+    TbWiningUser selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TbWiningUser record);
+
+    int updateByPrimaryKey(TbWiningUser record);
+
+    List<TbWiningUser> selectAllByTrade(@Param("day") String day);
+}

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

@@ -0,0 +1,21 @@
+package com.chaozhanggui.system.cashierservice.dao;
+
+import com.chaozhanggui.system.cashierservice.entity.TbYhqParams;
+
+import java.util.List;
+
+public interface TbYhqParamsMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TbYhqParams record);
+
+    int insertSelective(TbYhqParams record);
+
+    TbYhqParams selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TbYhqParams record);
+
+    int updateByPrimaryKey(TbYhqParams record);
+
+    List<TbYhqParams> selectAll();
+}