1

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java

@@ -85,7 +85,8 @@ public class CardCouponUserServiceImpl extends ServiceImpl<CardCouponUserMapper,
      **/
     @Override
     public List<CardCouponVO> selectAllList(Integer storeId, Integer userId, Date nowDate) {
-        return cardCouponUserMapper.selectAllList(storeId, userId, DateUtil.formatDate(nowDate));
+        String s = DateUtil.format(nowDate, "yyyy-MM-dd HH:mm:ss");
+        return cardCouponUserMapper.selectAllList(storeId, userId, s);
     }
 
     @Override

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml

@@ -2,16 +2,44 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuint.business.userManager.mapper.LJUserMapper">
     <sql id="selectUser">
-        select mu.*,mub.grade_id,mub.card_balance,mub.points,mub.consume_num,mub.growth_value,mub.refuel_money,
-               mub.second_card,mub.fixing_level,
-               mi.storeId,mi.staffId,mi.inviterId,mub.chain_store_id from mt_user mu
+        select mu.*,
+               mub.grade_id,
+               mub.card_balance,
+               mub.points,
+               mub.consume_num,
+               mub.growth_value,
+               mub.refuel_money,
+               mub.second_card,
+               mub.fixing_level,
+               mi.storeId,
+               mi.staffId,
+               mi.inviterId,
+               mub.chain_store_id
+        from mt_user mu
                  left join mt_user_balance mub on mu.id = mub.mt_user_id
                  left join mt_invitation mi on mu.id = mi.userId
     </sql>
     <sql id="selectUserAndBalance">
-        select mu.*,mub.id balanceId,mub.grade_id,mub.card_balance,mub.points,mub.consume_num,mub.growth_value,mub.refuel_money,
-               mub.second_card,mub.fixing_level,mub.create_time balCreateTime,mub.remark remark,mub.user_label_id userLabelId,
-               mub.user_status,mub.store_id mubStoreId,mub.recharge_num,mub.used_amount,mub.used_points,mub.give_amount,mub.user_source
+        select mu.*,
+               mub.id            balanceId,
+               mub.grade_id,
+               mub.card_balance,
+               mub.points,
+               mub.consume_num,
+               mub.growth_value,
+               mub.refuel_money,
+               mub.second_card,
+               mub.fixing_level,
+               mub.create_time   balCreateTime,
+               mub.remark        remark,
+               mub.user_label_id userLabelId,
+               mub.user_status,
+               mub.store_id      mubStoreId,
+               mub.recharge_num,
+               mub.used_amount,
+               mub.used_points,
+               mub.give_amount,
+               mub.user_source
         FROM mt_user mu
                  LEFT JOIN mt_user_balance mub ON mu.id = mub.mt_user_id
     </sql>
@@ -273,8 +301,7 @@
                mub.refuel_money refuelMoney
         from mt_user mu
                  left join mt_user_balance mub on mu.id = mub.mt_user_id
-        where mu.id = #{userId}
-            limit 1
+        where mu.id = #{userId} limit 1
     </select>
 
     <select id="selectAllInfoById2" resultType="com.fuint.business.userManager.vo.LJUserVo">
@@ -286,8 +313,8 @@
                mub.refuel_money refuelMoney
         from mt_user mu
                  left join mt_user_balance mub on mu.id = mub.mt_user_id
-        where mu.id = #{userId} and mub.chain_store_id = #{chainStoreId}
-            limit 1
+        where mu.id = #{userId}
+          and mub.chain_store_id = #{chainStoreId} limit 1
     </select>
 
 
@@ -301,8 +328,7 @@
         from mt_user mu
                  left join mt_user_balance mub on mu.id = mub.mt_user_id
         where mu.id = #{userId}
-          and mub.chain_store_id = #{chainStoreId}
-            limit 1
+          and mub.chain_store_id = #{chainStoreId} limit 1
     </select>
 
     <select id="getUserCountList" resultType="com.fuint.business.userManager.vo.LJUserVo">
@@ -380,9 +406,13 @@
         </where>
     </select>
     <select id="userListByPhone" resultType="com.fuint.business.userManager.vo.LJUserVo">
-        select mu.*,mub.grade_id,mub.card_balance,mub.points,mub.consume_num,mub.growth_value,mub.refuel_money,
-        mub.second_card,mub.fixing_level,mub.chain_store_id from mt_user mu
+        select mu.*,mub.grade_id,mub.card_balance,mub.points,
+        mub.consume_num,mub.growth_value,mub.refuel_money,
+        mub.second_card,mub.fixing_level,mub.chain_store_id,
+        gr.name AS gradeName
+        from mt_user mu
         left join mt_user_balance mub on mu.id = mub.mt_user_id
+        LEFT JOIN mt_user_grade gr on gr.id = mub.grade_id
         <where>
             mu.mobile like concat('%',#{mobile},'%') and
             mub.store_id = #{storeId} and mub.user_status = '0'

fuintBackend/fuint-application/src/main/java/com/fuint/pay/service/impl/PayCenterServiceImpl.java

@@ -479,6 +479,7 @@ public class PayCenterServiceImpl implements PayCenterService {
                 couponVO.setCouponId(rule.getId());
                 couponVO.setName(rule.getName());
                 couponVO.setUseWithOther(rule.getUseWithOther());
+                couponVO.setType(rule.getType());
                 //计算优惠金额
                 couponVO.setDisAmount(checkUtil.computeDisAmountCoupon(rule, oilAmount, oilLiter));
                 rtnList.add(couponVO);

fuintBackend/fuint-application/src/main/java/com/fuint/pay/vo/CouponVO.java

@@ -21,4 +21,6 @@ public class CouponVO implements Serializable {
     private String useWithOther;
     /** 优惠金额 */
     private Double disAmount;
+//  优惠卷类型
+    private String type;
 }