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

fix bill

release_toaliyun_real
winter 4 лет назад
Родитель
Сommit
6806c098e0
3 измененных файлов: 8 добавлений и 8 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxBillAllService.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  3. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java

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

@@ -27,7 +27,7 @@ public interface WxBillAllService {
//List<Map<String, Object>> listBillOweAndWaitPay(WxBillAll wxBillAll);

ResultData pageListBill(WxBillAll wxBillAll,WxMerchant wxMerchant,boolean hasShop,boolean hasPayBill,boolean hasReceivePay);
List<Map<String, Object>> listBill(WxBillAll wxBillAll,WxMerchant wxMerchant,boolean hasShop,boolean hasPayBill,boolean hasReceivePay);
List<Map<String, Object>> listBill(WxBillAll wxBillAll,WxMerchant wxMerchant,boolean hasSet,boolean hasShop,boolean hasPayBill,boolean hasReceivePay);

void updateBill(Map<String, Object> bill);



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

@@ -284,12 +284,12 @@ public class WxBillAllServiceImpl implements WxBillAllService {
//更新各账单状态
//updateBillStatus(wxBillAll);
PageHelper.startPage(wxBillAll.getPageIndex(), wxBillAll.getPageSize());
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(listBill(wxBillAll, wxMerchant, hasShop, hasPayBill, hasReceivePay));
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(listBill(wxBillAll, wxMerchant,true, hasShop, hasPayBill, hasReceivePay));
return new ResultData(pageInfo);
}
@Override
public List<Map<String, Object>> listBill(WxBillAll wxBillAll,WxMerchant wxMerchant,boolean hasShop,boolean hasPayBill,boolean hasReceivePay){
public List<Map<String, Object>> listBill(WxBillAll wxBillAll,WxMerchant wxMerchant,boolean hasSet,boolean hasShop,boolean hasPayBill,boolean hasReceivePay){
List<Map<String, Object>> maps = null;
//账单类型
wxBillAll.setBillTypeValue(EnumBillQueryType.getRealType(wxBillAll.getBillTypeValue()));
@@ -320,7 +320,7 @@ public class WxBillAllServiceImpl implements WxBillAllService {
} else {
logger.info("账单不存在");
}
if (null != maps) {
if (null != maps && hasSet) {
for (Map<String, Object> map : maps) {
Integer billType = ((Long) map.get("billTypeValue")).intValue();
if (EnumBillType.SETTLE.getCode().equals(billType)) {


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

@@ -102,7 +102,7 @@ public class WxPayBillServiceImpl implements WxPayBillService {
wxBillAll.updateTenantInfo(record);
wxBillAll.setId(record.getBillId());
wxBillAll.setBillTypeValue(billTypeValue);
List<Map<String, Object>> bills = wxBillAllService.listBill(wxBillAll,null,false,false,false);
List<Map<String, Object>> bills = wxBillAllService.listBill(wxBillAll,null,true,false,false,false);
if (bills.size()==0) {
logger.error("pay bill, bill not allow, repaymentReq: " + JSONObject.toJSONString(record) + ", payWay: " + payWay.toString());
throw new MallinkException(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND);
@@ -709,7 +709,7 @@ public class WxPayBillServiceImpl implements WxPayBillService {
WxBillAll wxBillAll = new WxBillAll();
wxBillAll.setId(record.getBillId());
wxBillAll.setBillTypeValue(record.getBillTypeValue());
List<Map<String, Object>> bills = wxBillAllService.listBill(wxBillAll, null, false, false, false);
List<Map<String, Object>> bills = wxBillAllService.listBill(wxBillAll, null,false, false, false, false);
if (bills.size() > 0) {
Map<String, Object> bill = bills.get(0);
bill.put("userId", record.getbUserId());
@@ -724,7 +724,7 @@ public class WxPayBillServiceImpl implements WxPayBillService {
WxBillAll wxBillAll = new WxBillAll();
wxBillAll.setId(record.getBillId());
wxBillAll.updateTenantInfo(record);
List<Map<String, Object>> bills = wxBillAllService.listBill(wxBillAll, null, false, false, false);
List<Map<String, Object>> bills = wxBillAllService.listBill(wxBillAll, null,false, false, false, false);
if (bills.size()==0) {
logger.error("pay success handle, bill " + record.getBillId() + " not found , payBillNo : " + record.getPayBillNo());
throw new MallinkException(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND);
@@ -768,7 +768,7 @@ public class WxPayBillServiceImpl implements WxPayBillService {
WxBillAll wxBillAll = new WxBillAll();
wxBillAll.setId(record.getBillId());
wxBillAll.setBillTypeValue(record.getBillTypeValue());
List<Map<String, Object>> bills = wxBillAllService.listBill(wxBillAll, null, false, false, false);
List<Map<String, Object>> bills = wxBillAllService.listBill(wxBillAll, null,false, false, false, false);
if (bills.size()==0) {
logger.error("pay handle, bill " + record.getBillId() + " not found , payBillNo : " + record.getPayBillNo());
throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND);


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