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

Merge commit '3c867383345caac82343c8e8fa1ab0acc88f0a05' into release

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
d620a71c88
1 измененных файлов: 13 добавлений и 1 удалений
  1. +13
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java

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

@@ -14,6 +14,7 @@ import com.iformall.service.ExcelService;
import com.iformall.service.WxBillSettleService; import com.iformall.service.WxBillSettleService;
import com.iformall.service.WxFlowService; import com.iformall.service.WxFlowService;
import com.iformall.utils.DateUtils; import com.iformall.utils.DateUtils;
import io.swagger.models.auth.In;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -361,6 +362,15 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
} }
} }


public Integer getType(Long billId, WxBillSettle record){
for (WxBillSettleBill bill:record.getReceiveBillIds()) {
if(bill.getBillId().equals(billId)){
return 0;
}
}
return 1;
}

@Override @Override
@Transactional @Transactional
public ResultData saveOrUpdate(WxBillSettle record, MallUserInfo userInfo) { public ResultData saveOrUpdate(WxBillSettle record, MallUserInfo userInfo) {
@@ -369,7 +379,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
//检查账单是否存在其他结算单中 //检查账单是否存在其他结算单中
WxBillSettle query = new WxBillSettle(); WxBillSettle query = new WxBillSettle();
query.setId(record.getId()); query.setId(record.getId());
List<WxBillSettleBill> list = record.getReceiveBillIds();
List<WxBillSettleBill> list = new ArrayList<>()
list.addAll(record.getReceiveBillIds());
list.addAll(record.getPayBillIds()); list.addAll(record.getPayBillIds());
query.setReceiveBillIds(list); query.setReceiveBillIds(list);
List<WxBillSettleBill> existList = wxBillSettleBillMapper.findExist(query); List<WxBillSettleBill> existList = wxBillSettleBillMapper.findExist(query);
@@ -382,6 +393,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
for (Long id:idSet) { for (Long id:idSet) {
WxBillSettleBill queryBill = new WxBillSettleBill(); WxBillSettleBill queryBill = new WxBillSettleBill();
queryBill.setBillId(id); queryBill.setBillId(id);
queryBill.setType(getType(id,record));
WxBillSettleBill db = wxBillSettleBillMapper.findByBillId(queryBill).get(0); WxBillSettleBill db = wxBillSettleBillMapper.findByBillId(queryBill).get(0);
BigDecimal r = new BigDecimal(db.getReceivePay()).divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP); BigDecimal r = new BigDecimal(db.getReceivePay()).divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP);
ids += db.getBillName()+r.toString()+"元,"; ids += db.getBillName()+r.toString()+"元,";


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