ソースを参照

Merge commit 'e110c1bbdf535bc775bc09ebb22d7cdcd31aa734' into release

release_toaliyun_real
luozukai 7年前
コミット
bae2d84caa
2個のファイルの変更15行の追加4行の削除
  1. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java
  2. +13
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java ファイルの表示

@@ -72,6 +72,7 @@ public class WxAppinfoController extends BaseController {
String pageUrl = "pages/index/index"; String pageUrl = "pages/index/index";


List<WxMerchant> list = wxMerchantMapper.findQrcodeEmptyList(); List<WxMerchant> list = wxMerchantMapper.findQrcodeEmptyList();
logger.info("updateQrCode.count:"+list.size());
for (WxMerchant merchant : list) { for (WxMerchant merchant : list) {
fixedThreadPool.execute(new Runnable() { fixedThreadPool.execute(new Runnable() {
@Override @Override
@@ -95,6 +96,7 @@ public class WxAppinfoController extends BaseController {
String pageUrl = "pages/index/index"; String pageUrl = "pages/index/index";


List<WxCouponChannel> list = wxCouponChannelMapper.findQrcodeEmptyList(); List<WxCouponChannel> list = wxCouponChannelMapper.findQrcodeEmptyList();
logger.info("updateCouponQrCode.count:"+list.size());
for (WxCouponChannel couponChannel:list) { for (WxCouponChannel couponChannel:list) {
fixedThreadPool.execute(new Runnable() { fixedThreadPool.execute(new Runnable() {
@Override @Override


+ 13
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java ファイルの表示

@@ -1865,19 +1865,28 @@ public class WxRentContractServiceImpl implements WxRentContractService {


//结束时间 //结束时间
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
System.out.println(sd.format(start));
// System.out.println(sd.format(start));
instance.clear(); instance.clear();
instance.setTime(start); instance.setTime(start);
instance.add(dayType, receivePeriod); instance.add(dayType, receivePeriod);
instance.add(Calendar.DATE, -1); instance.add(Calendar.DATE, -1);
timeVo.setEndDate(instance.getTime()); timeVo.setEndDate(instance.getTime());

System.out.println(sd.format(instance.getTime()));
// System.out.println(sd.format(instance.getTime()));


//自然月 //自然月
if(adjustPeriod.equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ if(adjustPeriod.equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){
if(count == 0){ if(count == 0){
timeVo.setEndDate(DateUtils.getLastDayForMonth(timeVo.getStartDate()));
if(receivePeriod == 1) { //周期1个月 头一个月到当月底
timeVo.setEndDate(DateUtils.getLastDayForMonth(timeVo.getStartDate()));
}else{
Date firstDay = DateUtils.getFirstDayForCurrMonth(start);
instance.clear();
instance.setTime(firstDay);
//最后一个期有余,加上残月,不整除时,最后一个月有余,否则为0
instance.add(dayType, receivePeriod);
instance.add(Calendar.DAY_OF_MONTH, -1);
timeVo.setEndDate(instance.getTime());
}
} }
} }




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