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

[其他账单][修改][查询]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
2f75d79e62
10 измененных файлов: 40 добавлений и 19 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java
  2. +9
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java
  4. +12
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java
  5. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java
  6. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
  7. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
  8. +3
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  9. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  10. +2
    -2
      mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml

+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java Просмотреть файл

@@ -17,6 +17,6 @@ public interface WxBillOtherMapper extends CommonMapper<WxBillOther, String> {

void updateWaitPayStatus(Map<String, Object> params);

List<Map<String,Object>> queryBillDailyList(WxBillOther record);
List<Map<String,Object>> queryBillList(WxBillOther record);

}

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

@@ -6,14 +6,17 @@ import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillDaily;
import com.iformall.domain.po.WxShop;
import com.iformall.enums.EnumBillDailyStatus;
import com.iformall.enums.EnumBillRentStatus;
import com.iformall.enums.EnumDelStatus;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxBillDailyMapper;
import com.iformall.mapper.WxShopMapper;
import com.iformall.service.WxBillDailyService;
import org.apache.shiro.SecurityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -108,15 +111,18 @@ public class WxBillDailyServiceImpl implements WxBillDailyService {

@Override
public ResultData saveOrUpdate(WxBillDaily record) {
MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession");
if (record.getId() == null) {
logger.info("新增日常账单");
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
Date date = new Date();
record.setStatus(record.getReceiveDate().before(date)?EnumBillDailyStatus.WAIT_PAY.getCode():EnumBillDailyStatus.NOT_PAID.getCode());
record.setStatus(record.getReceiveDate().after(date)?EnumBillDailyStatus.WAIT_PAY.getCode():EnumBillDailyStatus.NOT_PAID.getCode());
record.setCreatetime(date);
record.setUpdatetime(date);
record.setUserId(user.getId());
record.setExpiredDay(0L);
record.setIsDel(EnumDelStatus.NOT_DEL.getCode());
try {
wxBillDailyMapper.insertSelective(record);
} catch (Exception e) {
@@ -136,6 +142,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService {
wxBillDaily.setOwe(record.getOwe());
wxBillDaily.setStatus(record.getPay().equals(record.getReceivePay()) ? EnumBillDailyStatus.PAID.getCode() : wxBillDaily.getStatus());
wxBillDaily.setUpdatetime(new Date());
wxBillDaily.setUserId(user.getId());
try {
wxBillDailyMapper.updateByPrimaryKeySelective(wxBillDaily);
} catch (Exception e) {


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

@@ -8,6 +8,7 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxBillDeposit;
import com.iformall.enums.EnumBillRentStatus;
import com.iformall.enums.EnumDelStatus;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxBillDepositMapper;
import com.iformall.service.WxBillDepositService;
@@ -100,6 +101,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService {
Date date = new Date();
record.setCreatetime(date);
record.setUpdatetime(date);
record.setIsDel(EnumDelStatus.NOT_DEL.getCode());
try {
wxBillDepositMapper.insertSelective(record);
} catch (Exception e) {


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

@@ -6,14 +6,17 @@ import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillOther;
import com.iformall.domain.po.WxShop;
import com.iformall.enums.EnumBillDailyStatus;
import com.iformall.enums.EnumBillRentStatus;
import com.iformall.enums.EnumDelStatus;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxBillOtherMapper;
import com.iformall.mapper.WxShopMapper;
import com.iformall.service.WxBillOtherService;
import org.apache.shiro.SecurityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,9 +45,9 @@ public class WxBillOtherServiceImpl implements WxBillOtherService {
//分页对象设置页数和条数
PageHelper.startPage(pageIndex, pageSize);
//查询
List<Map<String, Object>> billDepositList = wxBillOtherMapper.queryBillDailyList(record);
List<Map<String, Object>> billList = wxBillOtherMapper.queryBillList(record);
//结果放入分页对象
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(billDepositList);
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(billList);
return pageInfo;

}
@@ -92,7 +95,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService {
public Map<String,Object> getById(Long id) {
WxBillOther record = new WxBillOther();
record.setId(id);
Map<String, Object> wxBillOther = wxBillOtherMapper.queryBillDailyList(record).get(0);
Map<String, Object> wxBillOther = wxBillOtherMapper.queryBillList(record).get(0);

if(wxBillOther.get("shopId")!=null) {
WxShop shop = new WxShop();
@@ -108,15 +111,18 @@ public class WxBillOtherServiceImpl implements WxBillOtherService {

@Override
public ResultData saveOrUpdate(WxBillOther record) {
MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession");
if (record.getId() == null) {
logger.info("新增其他账单");
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
Date date = new Date();
record.setStatus(record.getReceiveDate().before(date)?EnumBillDailyStatus.WAIT_PAY.getCode():EnumBillDailyStatus.NOT_PAID.getCode());
record.setStatus(record.getReceiveDate().after(date)?EnumBillDailyStatus.WAIT_PAY.getCode():EnumBillDailyStatus.NOT_PAID.getCode());
record.setCreatetime(date);
record.setUpdatetime(date);
record.setUserId(user.getId());
record.setExpiredDay(0L);
record.setIsDel(EnumDelStatus.NOT_DEL.getCode());
try {
wxBillOtherMapper.insertSelective(record);
} catch (Exception e) {
@@ -136,6 +142,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService {
wxBillOther.setOwe(record.getOwe());
wxBillOther.setStatus(record.getPay().equals(record.getReceivePay()) ? EnumBillDailyStatus.PAID.getCode() : wxBillOther.getStatus());
wxBillOther.setUpdatetime(new Date());
wxBillOther.setUserId(user.getId());
try {
wxBillOtherMapper.updateByPrimaryKeySelective(wxBillOther);
} catch (Exception e) {


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

@@ -8,6 +8,7 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxBillPropertyDeposit;
import com.iformall.enums.EnumBillRentStatus;
import com.iformall.enums.EnumDelStatus;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxBillPropertyDepositMapper;
import com.iformall.service.WxBillPropertyDepositService;
@@ -101,6 +102,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe
Date date = new Date();
record.setCreatetime(date);
record.setUpdatetime(date);
record.setIsDel(EnumDelStatus.NOT_DEL.getCode());
try {
wxBillPropertyDepositMapper.insertSelective(record);
} catch (Exception e) {


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

@@ -8,6 +8,7 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxBillProperty;
import com.iformall.enums.EnumBillRentStatus;
import com.iformall.enums.EnumDelStatus;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxBillPropertyMapper;
import com.iformall.service.WxBillPropertyService;
@@ -98,6 +99,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService {
Date date = new Date();
record.setCreatetime(date);
record.setUpdatetime(date);
record.setIsDel(EnumDelStatus.NOT_DEL.getCode());
try {
wxBillPropertyMapper.insertSelective(record);
} catch (Exception e) {


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

@@ -8,6 +8,7 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxBillRent;
import com.iformall.enums.EnumBillRentStatus;
import com.iformall.enums.EnumDelStatus;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxBillRentMapper;
import com.iformall.service.WxBillRentService;
@@ -99,6 +100,7 @@ public class WxBillRentServiceImpl implements WxBillRentService {
Date date = new Date();
record.setCreatetime(date);
record.setUpdatetime(date);
record.setIsDel(EnumDelStatus.NOT_DEL.getCode());
try {
wxBillRentMapper.insertSelective(record);
} catch (Exception e) {


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

@@ -8,6 +8,7 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
import com.iformall.enums.EnumBillRentStatus;
import com.iformall.enums.EnumDelStatus;
import com.iformall.enums.EnumRentContractStatus;
import com.iformall.enums.EnumShopStatus;
import com.iformall.exception.MallinkException;
@@ -177,7 +178,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
int needpay = wxPropertyContract.getDeposit();
wxBillDeposit.setNeedPay(needpay);
wxBillDeposit.setOwe(needpay);

Date date = new Date();
Calendar instance = Calendar.getInstance();
instance.setTime(wxPropertyContract.getRentalStartDate());
@@ -185,7 +185,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
instance.add(Calendar.DAY_OF_MONTH, -1);
Date time = instance.getTime();
wxBillDeposit.setReceiveDate(time);

//账单开始时间
instance.clear();
instance.setTime(wxBillDeposit.getReceiveDate());
@@ -196,7 +195,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
instance.setTime(wxBillDeposit.getReceiveDate());
instance.add(Calendar.MONTH, wxPropertyContract.getLease());
wxBillDeposit.setEndtime(instance.getTime());

//截止收租日在当前时间之前
if (wxBillDeposit.getReceiveDate().before(date)) {
long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000);
@@ -216,6 +214,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
wxBillDeposit.setShopId(wxPropertyContract.getShopId());
wxBillDeposit.setCreatetime(date);
wxBillDeposit.setUpdatetime(date);
wxBillDeposit.setIsDel(EnumDelStatus.NOT_DEL.getCode());
try {
wxBillPropertyDepositMapper.insertSelective(wxBillDeposit);
} catch (Exception e) {
@@ -227,10 +226,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService

@Transactional(rollbackFor = {Exception.class})
public void buildProperty(WxMerchant wxMerchant) {

//获取用户
MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession");

//根据商户ID找出合同
WxPropertyContract wxPropertyContract = new WxPropertyContract();
wxPropertyContract.setMerchantId(wxMerchant.getId());
@@ -270,9 +267,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
instance.add(Calendar.DAY_OF_MONTH, 1);
instance.add(Calendar.MONTH, receivePeriod);
wxBillRent.setEndtime(instance.getTime());

int needpay = wxPropertyContract.getPrice()*receivePeriod;

if (extracount > 0 && i == index) {
//账单开始时间
instance.clear();
@@ -289,7 +284,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
}
wxBillRent.setNeedPay(needpay);
wxBillRent.setOwe(needpay);

//截止收租日在当前时间之前
if (wxBillRent.getReceiveDate().before(date)) {
long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000);
@@ -311,7 +305,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
wxBillRent.setReceiveDate(time);
}
}

wxBillRent.setTenantId(wxMerchant.getTenantId());
wxBillRent.setIsDel(0);
wxBillRent.setMerchantId(wxMerchant.getId());
@@ -319,6 +312,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
wxBillRent.setShopId(wxPropertyContract.getShopId());
wxBillRent.setCreatetime(date);
wxBillRent.setUpdatetime(date);
wxBillRent.setIsDel(EnumDelStatus.NOT_DEL.getCode());
try {
wxBillPropertyMapper.insertSelective(wxBillRent);
} catch (Exception e) {


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

@@ -8,6 +8,7 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
import com.iformall.enums.EnumBillRentStatus;
import com.iformall.enums.EnumDelStatus;
import com.iformall.enums.EnumRentContractStatus;
import com.iformall.enums.EnumShopStatus;
import com.iformall.exception.MallinkException;
@@ -241,6 +242,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxBillDeposit.setShopId(wxRentContract.getShopId());
wxBillDeposit.setCreatetime(date);
wxBillDeposit.setUpdatetime(date);
wxBillDeposit.setIsDel(EnumDelStatus.NOT_DEL.getCode());

try {
wxBillDepositMapper.insertSelective(wxBillDeposit);
} catch (Exception e) {
@@ -343,6 +346,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxBillRent.setShopId(wxRentContract.getShopId());
wxBillRent.setCreatetime(date);
wxBillRent.setUpdatetime(date);
wxBillRent.setIsDel(EnumDelStatus.NOT_DEL.getCode());

try {
wxBillRentMapper.insertSelective(wxBillRent);
} catch (Exception e) {


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

@@ -59,11 +59,11 @@
<include refid="dynamicWhereConditions" />
</select>
<select id="queryBillDailyList" parameterType="com.iformall.domain.po.WxBillOther" resultType="hashmap">
<select id="queryBillList" parameterType="com.iformall.domain.po.WxBillOther" resultType="hashmap">
select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate,
br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`,
m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`,
br.`merchant_id` merchantId,br.shop_id shopId,br.name
br.`merchant_id` merchantId,br.shop_id shopId,br.name,br.comments
from wx_bill_other br left join wx_merchant m on br.merchant_id=m.id
left join wx_shop s on br.shop_id=s.id
<where>


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