ソースを参照

Merge commit 'refs/tags/jenkins-back-end-730^{}' into release

release_toaliyun_real
hupeng 7年前
コミット
7aabba8030
2個のファイルの変更4行の追加10行の削除
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  2. +2
    -8
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java ファイルの表示

@@ -271,7 +271,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
if (list.size() > 0) {
wxPropertyContract = list.get(0);
//找到计租方式
int dayType = wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH;
int dayType = wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH;
final IdWorker idWorker = IdWorker.get();
WxBillPropertyDeposit wxBillDeposit = new WxBillPropertyDeposit();
wxBillDeposit.setId(idWorker.nextId());
@@ -331,7 +331,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
List<WxPropertyContract> list = wxPropertyContractMapper.findList(wxPropertyContract);
if (list.size() > 0) {
wxPropertyContract = list.get(0);
int dayType = wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) ? Calendar.MONTH : Calendar.DAY_OF_MONTH;
int dayType = wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH;
int receivePeriod = wxPropertyContract.getReceivePeriod().intValue();
Integer lease = wxPropertyContract.getLease();
int extralease = lease % receivePeriod;


+ 2
- 8
mallinkService/src/main/resources/mapper/WxOrderMapper.xml ファイルの表示

@@ -491,12 +491,6 @@
where o.type in (1,2) and o.order_status in (1,4) ) o
left join wx_merchant m on o.merchant_id=m.id
left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id
union all
select o.id,o.order_number,o.tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.type,o.payment_type,o.payment,o.payment_time,
o.order_status,o.create_date,o.update_date,o.detail,m.`name` merchant_name,cubi.`name` c_user_name,cubi.phone
from wx_order o left join wx_merchant m on o.product_id=m.id
left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id
where o.type=3 and o.order_status in (1,4)
) o
<where>
<if test="tenantId!=null">
@@ -519,7 +513,7 @@
select o.*, m.`name` merchantName from (
select o.*,cm.merchant_id from wx_order o
left join wx_coupon_merchant cm on o.product_id=cm.product_id
where o.type in (0,3) and o.order_status in (1,4)) o
where o.type = 0 and o.order_status in (1,4)) o
left join wx_merchant m on o.merchant_id=m.id
union all
select o.*,m.`name` merchantName from (
@@ -544,7 +538,7 @@
select o.*,m.`name` merchantName from (
select o.*,cm.merchant_id from wx_order o
left join wx_coupon_merchant cm on o.product_id=cm.product_id
where o.type in (0,3) and o.order_status = #{order_status}) o
where o.type = 0 and o.order_status = #{order_status}) o
left join wx_merchant m on o.merchant_id=m.id
union all
select o.*,m.`name` merchantName from (


読み込み中…
キャンセル
保存