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

Merge commit '41bfd8ba4924a962b458fb42718ad24f6ccbbe12' into release

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
9b5ac7b484
3 измененных файлов: 40 добавлений и 6 удалений
  1. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java
  2. +5
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java
  3. +33
    -4
      mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml

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

@@ -211,7 +211,7 @@ public class CouponSendSchedule {
/** /**
* 生日券发放 * 生日券发放
*/ */
@Scheduled(cron = "0 30 8 * * ?") // 测试每天8:30点发券
@Scheduled(cron = "0 30 14 * * ?") // 测试每天8:30点发券
public void birthdayCouponSendSchedule() { public void birthdayCouponSendSchedule() {
logger.info("生日发券: 任务开始"); logger.info("生日发券: 任务开始");
List<WxMall> mallList = wxMallMapper.findList(new WxMall()); List<WxMall> mallList = wxMallMapper.findList(new WxMall());
@@ -303,7 +303,7 @@ public class CouponSendSchedule {
} }
}).collect(Collectors.toList()); }).collect(Collectors.toList());


List<WxCUserBasicInfo> couponSendedUsers = new ArrayList<>();
Set<WxCUserBasicInfo> couponSendedUsers = new HashSet<>();
for (WxCouponSendVo cs : couponSendList) { for (WxCouponSendVo cs : couponSendList) {
if (cs.getRemainInventory() <= 0) { if (cs.getRemainInventory() <= 0) {
logger.info("生日发券: [title={},id={}]卡券库存不足!", cs.getTitle(), cs.getCouponId()); logger.info("生日发券: [title={},id={}]卡券库存不足!", cs.getTitle(), cs.getCouponId());


+ 5
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java Просмотреть файл

@@ -50,4 +50,9 @@ public class WxBillSettleBill extends BaseEntity {
@Transient @Transient
@io.swagger.annotations.ApiModelProperty(value="账单结束时间",name="endtime") @io.swagger.annotations.ApiModelProperty(value="账单结束时间",name="endtime")
private Date endtime; private Date endtime;


@Transient
@io.swagger.annotations.ApiModelProperty(value="获取应收还是欠缴 0欠缴 1应收",name="getReceivePayOrOwe")
private Integer getReceivePayOrOwe;
} }

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

@@ -46,12 +46,23 @@
</select> </select>


<select id="findBySettleId" parameterType="com.iformall.domain.po.WxBillSettleBill" resultMap="BaseResultMap"> <select id="findBySettleId" parameterType="com.iformall.domain.po.WxBillSettleBill" resultMap="BaseResultMap">
select bill.starttime,bill.endtime,bl.bill_id,bl.bill_type,bill.bill_type billName,IFNULL(bill.owe,0) receivePay from wx_bill_settle_bill bl left join
select bill.starttime,bill.endtime,bl.bill_id,bl.bill_type,bill.bill_type billName,IFNULL(bill.receive_pay,0) receivePay

from wx_bill_settle_bill bl left join
(select id,merchant_id,shop_id,tenant_id,1 bill_type_value,'租金-租金' (select id,merchant_id,shop_id,tenant_id,1 bill_type_value,'租金-租金'
bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_rent where is_preview = 0 bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_rent where is_preview = 0
union all union all
select id,merchant_id,shop_id,tenant_id,2 bill_type_value,'租赁押金-租赁押金' select id,merchant_id,shop_id,tenant_id,2 bill_type_value,'租赁押金-租赁押金'
bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from
bill_type,need_pay,
<choose>
<when test="1==type">
owe receive_pay
</when>
<otherwise>
receive_pay
</otherwise>
</choose>
,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from
wx_bill_rent_deposit wx_bill_rent_deposit
union all union all
select id,merchant_id,shop_id,tenant_id,3 bill_type_value,'物业费-物业费' select id,merchant_id,shop_id,tenant_id,3 bill_type_value,'物业费-物业费'
@@ -59,7 +70,16 @@
wx_bill_property where is_preview = 0 wx_bill_property where is_preview = 0
union all union all
select id,merchant_id,shop_id,tenant_id,4 bill_type_value,'物业押金-物业押金' select id,merchant_id,shop_id,tenant_id,4 bill_type_value,'物业押金-物业押金'
bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from
bill_type,need_pay,
<choose>
<when test="1==type">
owe receive_pay
</when>
<otherwise>
receive_pay
</otherwise>
</choose>
,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from
wx_bill_property_deposit wx_bill_property_deposit
union all union all
select id,merchant_id,shop_id,tenant_id,5 bill_type_value,'水费-水费' bill_type,0 as select id,merchant_id,shop_id,tenant_id,5 bill_type_value,'水费-水费' bill_type,0 as
@@ -78,7 +98,16 @@
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_other need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_other
union all union all
select id,merchant_id,shop_id,tenant_id,8 bill_type_value,concat('其他押金-',comments) as bill_type,0 as select id,merchant_id,shop_id,tenant_id,8 bill_type_value,concat('其他押金-',comments) as bill_type,0 as
need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_other_deposit
need_pay,
<choose>
<when test="1==type">
owe receive_pay
</when>
<otherwise>
receive_pay
</otherwise>
</choose>
,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,starttime,endtime from wx_bill_other_deposit


union all union all
select id, id merchant_id,'' shop_id,tenant_id,10 bill_type_value,'补贴-补贴' bill_type,0 as select id, id merchant_id,'' shop_id,tenant_id,10 bill_type_value,'补贴-补贴' bill_type,0 as


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