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

[合同][修改][开发账单结算]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
476f87e817
5 измененных файлов: 59 добавлений и 4 удалений
  1. +3
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumBillTypeParam.java
  2. +39
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumSettleRecordWay.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxBillSettleRecordService.java
  4. +15
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java

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

@@ -15,7 +15,9 @@ public enum EnumBillTypeParam {
POWER(6, "电费"),
ROUTINE(7, "其他费用"),
ATHER_DEPOSIT(8, "其他押金"),
AIR_CONDITIONING(9, "空调费")
AIR_CONDITIONING(9, "空调费"),

SETTLE(10, "结算单")
;

public static EnumBillTypeParam getEnum(Integer code) {


+ 39
- 0
mallinkService/src/main/java/com/iformall/enums/EnumSettleRecordWay.java Просмотреть файл

@@ -0,0 +1,39 @@
package com.iformall.enums;

/**
* Created by Stormeye on 2018/08/09.
*/
public enum EnumSettleRecordWay {
//清算方式 1现金2支付宝3微信4银行卡转账5其他
M(1, "现金"),
ZFB(2, "支付宝"),
WEBCAT(3, "微信"),
CARD(4, "银行卡转账"),
OTHER(5, "其他"),
;

public static EnumSettleRecordWay getEnum(Integer code) {
for (EnumSettleRecordWay value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumSettleRecordWay(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

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

@@ -23,6 +23,6 @@ public interface WxBillSettleRecordService {
*
* @param record
*/
ResultData saveOrUpdate(WxBillSettleRecord record,MallUserInfo mallUserInfo);
ResultData saveOrUpdate(WxBillSettleRecord record);

}

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

@@ -117,6 +117,9 @@ public class WxBillAllServiceImpl implements WxBillAllService {
@Autowired
StringRedisTemplate stringRedisTemplate;

@Autowired
WxBillSettleRecordService wxBillSettleRecordService;

@Override
public Map<String, Object> listAsPage(WxBillAll record, Integer pageIndex, Integer pageSize) {
//更新各账单状态
@@ -241,7 +244,18 @@ public class WxBillAllServiceImpl implements WxBillAllService {
if (wxBillOtherDeposit != null && !wxBillOtherDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode())) {
updateBillOtherDeposit(bill);
}
} else {
} else if (billTypeValue == EnumBillTypeParam.SETTLE.getCode().intValue()) {
logger.info("更新结算单");
WxBillSettleRecord settleRecord = new WxBillSettleRecord();
settleRecord.setSettleId((Long)bill.get("id"));
settleRecord.setSettleMoney((Long) bill.get("owe"));
settleRecord.setSettleTime(new Date());
settleRecord.setSettleWay(EnumSettleRecordWay.WEBCAT.getCode());

BigDecimal money = new BigDecimal(settleRecord.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP);
settleRecord.setDetail(EnumSettleRecordWay.getEnum(settleRecord.getSettleWay()).getMessage()+"收款"+money.toString()+"元");
wxBillSettleRecordService.saveOrUpdate(settleRecord);
}else{
logger.info("账单类型不存在");
}
}


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

@@ -26,7 +26,7 @@ public class WxBillSettleRecordServiceImpl implements WxBillSettleRecordService
}

@Override
public ResultData saveOrUpdate(WxBillSettleRecord record,MallUserInfo mallUserInfo) {
public ResultData saveOrUpdate(WxBillSettleRecord record) {
final IdWorker idWorker = IdWorker.get();
if (record.getId() == null) {
record.setId(idWorker.nextId());


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