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

[系统][修改]:完成每日订单付款总额,核销总额落表

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
3424a58959
3 измененных файлов: 54 добавлений и 5 удалений
  1. +29
    -1
      mallinkService/src/main/java/com/simple/schedule/DaliyAmountSchedule.java
  2. +5
    -3
      mallinkService/src/main/java/com/simple/service/WxDateAmountRecordService.java
  3. +20
    -1
      mallinkService/src/main/java/com/simple/service/impl/WxDateAmountRecordServiceImpl.java

+ 29
- 1
mallinkService/src/main/java/com/simple/schedule/DaliyAmountSchedule.java Просмотреть файл

@@ -1,6 +1,8 @@
package com.simple.schedule;

import com.simple.common.IdWorker;
import com.simple.domain.po.WxCouponOrder;
import com.simple.domain.po.WxDateAmountRecord;
import com.simple.domain.po.WxMall;
import com.simple.domain.po.WxMerchant;
import com.simple.mapper.*;
@@ -90,6 +92,30 @@ public class DaliyAmountSchedule {
"TOTAL ORDER=" + total_price);


Date now = new Date();
Calendar cal = Calendar.getInstance();
cal.setTime(now); // 将时分秒,毫秒域清零
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0);
now = cal.getTime();

WxDateAmountRecord dateAmountRecord = new WxDateAmountRecord();
dateAmountRecord.setId(IdWorker.get().nextId());
dateAmountRecord.setCreateDate(new Date());
dateAmountRecord.setUpdateDate(new Date());
dateAmountRecord.setPayPrice(total_price);
dateAmountRecord.setMerchantId(merchant.getId());
dateAmountRecord.setTenantId(merchant.getTenantId());
dateAmountRecord.setType(0);
dateAmountRecord.setDate(now);
dateAmountRecord.setDayOfWeek(cal.get(Calendar.DAY_OF_WEEK));
dateAmountRecord.setMonth(cal.get(Calendar.MONTH));
dateAmountRecord.setWeekOfYear(cal.getWeekYear());

wxDateAmountRecordService.saveDaliyAmount(dateAmountRecord);

list= wxCouponOrderMapper.findListOfVerifiedByDate(dateMap);
logger.info("find " + list.size() + " coupon order from " + startDate + " to " + new Date());
total_price = 0;
@@ -101,7 +127,9 @@ public class DaliyAmountSchedule {
"from " + startDate + " to " + new Date() +"\n" +
"TOTAL VERIFIED=" + total_price);

//daliy amount 落表
dateAmountRecord.setPayPrice(total_price);
dateAmountRecord.setType(1);
wxDateAmountRecordService.saveDaliyAmount(dateAmountRecord);

}
}


+ 5
- 3
mallinkService/src/main/java/com/simple/service/WxDateAmountRecordService.java Просмотреть файл

@@ -49,8 +49,10 @@ public interface WxDateAmountRecordService {
int updateAmount(String tenantId,Long merchantId
,Integer type,Integer payPrice);

/**
* 记录每日交易核销总额
*/

void saveDaliyAmount(WxDateAmountRecord amount);
}

+ 20
- 1
mallinkService/src/main/java/com/simple/service/impl/WxDateAmountRecordServiceImpl.java Просмотреть файл

@@ -62,5 +62,24 @@ public class WxDateAmountRecordServiceImpl implements WxDateAmountRecordService
r.setPayPrice(payPrice);
return wxDateAmountRecordMapper.updateAmount(r);
}

@Override
public void saveDaliyAmount(WxDateAmountRecord amount) {

WxDateAmountRecord record = new WxDateAmountRecord();
record.setDate(amount.getDate());
record.setTenantId(amount.getTenantId());
record.setMerchantId(amount.getMerchantId());
record.setType(amount.getType());

List<WxDateAmountRecord> list = wxDateAmountRecordMapper.findList(record);

if (list.size() > 0){
list.get(0).setPayPrice(amount.getPayPrice());
list.get(0).setUpdateDate(new Date());
wxDateAmountRecordMapper.updateByPrimaryKeySelective(list.get(0));
}else{
wxDateAmountRecordMapper.insertSelective(amount);
}
}
}

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