Просмотр исходного кода

merge branch 'develop' of https://git.youlane.cn/server/formallProject into develop

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
404edea37b
4 измененных файлов: 12 добавлений и 6 удалений
  1. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/FloatingLayerSchedule.java
  2. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  3. +2
    -2
      mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml
  4. +3
    -3
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/FloatingLayerSchedule.java Просмотреть файл

@@ -22,7 +22,7 @@ public class FloatingLayerSchedule {
/** /**
* 每天0点5分执行 * 每天0点5分执行
*/ */
@Scheduled(cron = "0 48 10 * * ?")
@Scheduled(cron = "0 5 0 * * ?")
public void sendMsg() { public void sendMsg() {
logger.info("删除前一天浮层用户数据开始"); logger.info("删除前一天浮层用户数据开始");
wxCuserFloatingLayerMapper.delete(null); wxCuserFloatingLayerMapper.delete(null);


+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Просмотреть файл

@@ -335,6 +335,12 @@ public class WxBillAllServiceImpl implements WxBillAllService {
wxBillAllVo.setPayDateStr(DateUtils.format(wxBillAllVo.getPayDate())); wxBillAllVo.setPayDateStr(DateUtils.format(wxBillAllVo.getPayDate()));
wxBillAllVo.setRentStartTime(DateUtils.format(wxBillAllVo.getStarttime())); wxBillAllVo.setRentStartTime(DateUtils.format(wxBillAllVo.getStarttime()));
wxBillAllVo.setRentEndTime(DateUtils.format(wxBillAllVo.getEndtime())); wxBillAllVo.setRentEndTime(DateUtils.format(wxBillAllVo.getEndtime()));

//status不是欠缴,都展示0,与前端保持一致
if(!EnumBillRentStatus.NOT_PAID.getCode().equals(wxBillAllVo.getStatus())){
wxBillAllVo.setOwe(0l);
wxBillAllVo.setOweStr("0");
}
datalist.add(wxBillAllVo); datalist.add(wxBillAllVo);
} }
} }


+ 2
- 2
mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml Просмотреть файл

@@ -117,7 +117,7 @@




<select id="sceneDataMapJoinCouponOrder" resultType="com.iformall.domain.vo.MarkingSceneDataReportVo" parameterType="hashmap"> <select id="sceneDataMapJoinCouponOrder" resultType="com.iformall.domain.vo.MarkingSceneDataReportVo" parameterType="hashmap">
select DATE_FORMAT(create_date,'%m/%d') AS xTime,
select DATE_FORMAT(create_time,'%m/%d') AS xTime,
COUNT(wx_coupon_order.id) as tempCount COUNT(wx_coupon_order.id) as tempCount
from wx_coupon_action_log from wx_coupon_action_log
left join wx_coupon_order on wx_coupon_action_log.coupon_order_id=wx_coupon_order.id left join wx_coupon_order on wx_coupon_action_log.coupon_order_id=wx_coupon_order.id
@@ -148,7 +148,7 @@
</select> </select>


<select id="sceneDataJoinCouponOrderList" resultType="com.iformall.domain.vo.MarkingSceneDataReportVo" parameterType="hashmap"> <select id="sceneDataJoinCouponOrderList" resultType="com.iformall.domain.vo.MarkingSceneDataReportVo" parameterType="hashmap">
select DATE_FORMAT(create_date,'%Y-%m-%d') AS xTime,
select DATE_FORMAT(create_time,'%Y-%m-%d') AS xTime,
COUNT(wx_coupon_order.id) as tempCount COUNT(wx_coupon_order.id) as tempCount
from wx_coupon_action_log from wx_coupon_action_log
left join wx_coupon_order on wx_coupon_action_log.coupon_order_id=wx_coupon_order.id left join wx_coupon_order on wx_coupon_action_log.coupon_order_id=wx_coupon_order.id


+ 3
- 3
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml Просмотреть файл

@@ -261,7 +261,7 @@
<if test=" null != rentShopType "> <if test=" null != rentShopType ">
and m.id not in( and m.id not in(
select merchant_id from wx_rent_contract where tenant_id=#{tenantId} and rent_shop_type=1 and merchant_id is select merchant_id from wx_rent_contract where tenant_id=#{tenantId} and rent_shop_type=1 and merchant_id is
not null and status in(1,2,3,4)
not null and status in(1,2,3,4,8)
) )
</if> </if>
<if test=" null != ids "> <if test=" null != ids ">
@@ -490,10 +490,10 @@
</if> </if>


<if test=" null != userName "> <if test=" null != userName ">
and c.`nick_name` like concat('%', #{userName},'%')
and mb.`name` like concat('%', #{userName},'%')
</if> </if>
<if test=" null != phone "> <if test=" null != phone ">
and c.`phone` like concat('%', #{phone},'%')
and mb.`phone` like concat('%', #{phone},'%')
</if> </if>
<if test=" null != couponName "> <if test=" null != couponName ">
and co.`title` like concat('%', #{couponName},'%') and co.`title` like concat('%', #{couponName},'%')


Загрузка…
Отмена
Сохранить