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

[数据塔台][修改][租金相关为本年度数据]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
544c417ddf
3 измененных файлов: 36 добавлений и 14 удалений
  1. +31
    -9
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  2. +4
    -4
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

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

@@ -107,10 +107,17 @@ public class DataTowerServiceImpl implements DataTowerService {
HashMap<String, Object> rentMap = new HashMap<>();
Map<String, Object> params = new HashMap<>();
params.put("tenantId", tenantId);
Calendar calendar = Calendar.getInstance();//日历对象
calendar.setTime(new Date());//设置当前日期
calendar.add(Calendar.MONTH, -1);//月份减一
params.put("receiveDate", DateUtils.date2String(calendar.getTime(), "yyyy-MM"));

Calendar instance = Calendar.getInstance();
instance.set(Calendar.DAY_OF_YEAR,1);
instance.set(Calendar.HOUR_OF_DAY,0);
instance.set(Calendar.MINUTE,0);
instance.set(Calendar.SECOND,0);
String startdate = DateUtils.date2String(instance);
instance.clear();
String enddate = DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss");
params.put("startdate",startdate);
params.put("enddate",enddate);
Map<String, Object> payinfo = wxBillRentMapper.queryPayInfo(params);
if (payinfo != null) {
BigDecimal receivableAmount = (BigDecimal) payinfo.get("receivepay");
@@ -321,7 +328,16 @@ public class DataTowerServiceImpl implements DataTowerService {
HashMap<String, Object> billMap = new HashMap<>();
WxBillAll record = new WxBillAll();
record.setTenantId(tenantId);
record.setMonth(DateUtils.getSystemTime("yyyy-MM"));
Calendar instance = Calendar.getInstance();
instance.set(Calendar.DAY_OF_YEAR,1);
instance.set(Calendar.HOUR_OF_DAY,0);
instance.set(Calendar.MINUTE,0);
instance.set(Calendar.SECOND,0);
String startdate = DateUtils.date2String(instance);
instance.clear();
String enddate = DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss");
record.setStarttime(startdate);
record.setEndtime(enddate);
record.setStatus(EnumBillRentStatus.NOT_PAID.getCode());
Map<String, Object> oweInfo = wxBillAllMapper.queryOweInfo(record);
record.setStatus(EnumBillRentStatus.PAID.getCode());
@@ -399,10 +415,16 @@ public class DataTowerServiceImpl implements DataTowerService {
//租金
Map<String, Object> params = new HashMap<>();
params.put("tenantId", tenantId);
Calendar calendar = Calendar.getInstance();//日历对象
calendar.setTime(new Date());//设置当前日期
calendar.add(Calendar.MONTH, -1);//月份减一
params.put("receiveDate", DateUtils.date2String(calendar.getTime(), "yyyy-MM"));
Calendar instance = Calendar.getInstance();
instance.set(Calendar.DAY_OF_YEAR,1);
instance.set(Calendar.HOUR_OF_DAY,0);
instance.set(Calendar.MINUTE,0);
instance.set(Calendar.SECOND,0);
String startdate = DateUtils.date2String(instance);
instance.clear();
String enddate = DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss");
params.put("startdate",startdate);
params.put("enddate",enddate);
Map<String, Object> payinfo = wxBillRentMapper.queryPayInfo(params);
if (payinfo != null) {
BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay");


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

@@ -52,8 +52,8 @@
union
select id,merchant_id,shop_id,tenant_id,7 bill_type_value,'其他' bill_type,'' need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status from wx_bill_other
) bill
where date_format(bill.receive_date,'%Y-%m')=#{month} and bill.tenant_id=#{tenantId}
and bill.status=#{status}
where bill.tenant_id=#{tenantId} and bill.status=#{status}
and bill.receive_date between #{starttime} and #{endtime}
</select>
@@ -74,8 +74,8 @@
union
select id,merchant_id,shop_id,tenant_id,7 bill_type_value,'其他' bill_type,'' need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status from wx_bill_other
) bill
where date_format(bill.receive_date,'%Y-%m')=#{month} and bill.tenant_id=#{tenantId}
and bill.status=#{status}
where bill.tenant_id=#{tenantId} and bill.status=#{status}
and bill.receive_date between #{starttime} and #{endtime}

</select>


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

@@ -86,7 +86,7 @@
<select id="queryPayInfo" resultType="hashmap" parameterType="hashmap">
select sum(receive_pay) receivepay,sum(pay) pay,tenant_id from wx_bill_rent
where tenant_id=#{tenantId} and date_format(receive_date,'%Y-%m')=#{receiveDate}
where tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate}
group by tenant_id
</select>


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