| @@ -8,7 +8,7 @@ import com.iformall.controller.base.BaseController; | |||||
| import com.iformall.domain.po.BaseEntity; | import com.iformall.domain.po.BaseEntity; | ||||
| import com.iformall.domain.po.WxBillSettle; | import com.iformall.domain.po.WxBillSettle; | ||||
| import com.iformall.domain.po.WxBillSettleRecord; | import com.iformall.domain.po.WxBillSettleRecord; | ||||
| import com.iformall.enums.EnumFilter; | |||||
| import com.iformall.enums.EnumFilterSettle; | |||||
| import com.iformall.service.WxBillAllService; | import com.iformall.service.WxBillAllService; | ||||
| import com.iformall.service.WxBillSettleRecordService; | import com.iformall.service.WxBillSettleRecordService; | ||||
| import com.iformall.service.WxBillSettleService; | import com.iformall.service.WxBillSettleService; | ||||
| @@ -60,7 +60,7 @@ public class WxBillSettleController extends BaseController { | |||||
| @SystemControllerLog(description = "账单管理-结算单-id查找") | @SystemControllerLog(description = "账单管理-结算单-id查找") | ||||
| public ResultData findById(Long id) { | public ResultData findById(Long id) { | ||||
| logger.debug("[" + getIpAddr() + "] WxBillSettleController::findById"); | logger.debug("[" + getIpAddr() + "] WxBillSettleController::findById"); | ||||
| return new ResultData(Result.SUCCESS, "查询成功", wxBillSettleService.getById(id, EnumFilter.NO.getCode())); | |||||
| return new ResultData(Result.SUCCESS, "查询成功", wxBillSettleService.getById(id, EnumFilterSettle.NO.getCode())); | |||||
| } | } | ||||
| @PostMapping("addOrUpdate") | @PostMapping("addOrUpdate") | ||||
| @@ -6,7 +6,7 @@ import com.iformall.common.Result; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.WxMerchant; | import com.iformall.domain.po.WxMerchant; | ||||
| import com.iformall.domain.vo.WxBillAll; | import com.iformall.domain.vo.WxBillAll; | ||||
| import com.iformall.enums.EnumFilter; | |||||
| import com.iformall.enums.EnumFilterSettle; | |||||
| import com.iformall.enums.EnumMerchantStatus; | import com.iformall.enums.EnumMerchantStatus; | ||||
| import com.iformall.service.WxBillAllService; | import com.iformall.service.WxBillAllService; | ||||
| import com.iformall.service.WxBillSettleService; | import com.iformall.service.WxBillSettleService; | ||||
| @@ -92,7 +92,7 @@ public class WxBillController extends BaseController { | |||||
| @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) | @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) | ||||
| @ApiOperation("账单管理-结算单-id查找") | @ApiOperation("账单管理-结算单-id查找") | ||||
| public ResultData findById(Long id) { | public ResultData findById(Long id) { | ||||
| return new ResultData(Result.SUCCESS, "查询成功", wxBillSettleService.getById(id, EnumFilter.NO.getCode())); | |||||
| return new ResultData(Result.SUCCESS, "查询成功", wxBillSettleService.getById(id, EnumFilterSettle.NO.getCode())); | |||||
| } | } | ||||
| } | } | ||||
| @@ -0,0 +1,37 @@ | |||||
| package com.iformall.enums; | |||||
| /** | |||||
| * Created by Stormeye on 2018/08/09. | |||||
| */ | |||||
| public enum EnumFilterSettle { | |||||
| YES(0, "过滤"), | |||||
| NO(1, "不过滤"), | |||||
| ; | |||||
| public static EnumFilterSettle getEnum(Integer code) { | |||||
| for (EnumFilterSettle value : values()) { | |||||
| if (value.getCode().equals(code)) { | |||||
| return value; | |||||
| } | |||||
| } | |||||
| return null; | |||||
| } | |||||
| private Integer code; | |||||
| private String message; | |||||
| EnumFilterSettle(Integer code, String message) { | |||||
| this.code = code; | |||||
| this.message = message; | |||||
| } | |||||
| public Integer getCode() { | |||||
| return code; | |||||
| } | |||||
| public String getMessage() { | |||||
| return message; | |||||
| } | |||||
| } | |||||
| @@ -270,7 +270,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| try { | try { | ||||
| logger.info("更新结算单id:{}", JsonUtil.obj2Json(bill)); | logger.info("更新结算单id:{}", JsonUtil.obj2Json(bill)); | ||||
| WxBillSettle wxBillSettle = wxBillSettleService.getById((Long)bill.get("id"),EnumFilter.NO.getCode()); | |||||
| WxBillSettle wxBillSettle = wxBillSettleService.getById((Long)bill.get("id"), EnumFilterSettle.NO.getCode()); | |||||
| WxBillSettleRecord settleRecord = new WxBillSettleRecord(); | WxBillSettleRecord settleRecord = new WxBillSettleRecord(); | ||||
| settleRecord.setSettleId((Long)bill.get("id")); | settleRecord.setSettleId((Long)bill.get("id")); | ||||
| @@ -826,7 +826,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| @Override | @Override | ||||
| public void exportSettleBill(WxBillSettle wxBillSettle, HttpServletRequest request, HttpServletResponse response) { | public void exportSettleBill(WxBillSettle wxBillSettle, HttpServletRequest request, HttpServletResponse response) { | ||||
| wxBillSettle = wxBillSettleService.getById(wxBillSettle.getId(),EnumFilter.NO.getCode()); | |||||
| wxBillSettle = wxBillSettleService.getById(wxBillSettle.getId(), EnumFilterSettle.NO.getCode()); | |||||
| if(wxBillSettle.getReceiveBillIds() == null) wxBillSettle.setReceiveBillIds(new ArrayList<>()); | if(wxBillSettle.getReceiveBillIds() == null) wxBillSettle.setReceiveBillIds(new ArrayList<>()); | ||||
| if(wxBillSettle.getPayBillIds() == null) wxBillSettle.setPayBillIds(new ArrayList<>()); | if(wxBillSettle.getPayBillIds() == null) wxBillSettle.setPayBillIds(new ArrayList<>()); | ||||
| @@ -304,7 +304,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| wxBillSettle.setApplyStatus(applyStatus); | wxBillSettle.setApplyStatus(applyStatus); | ||||
| //审批完成,账单解冻 | //审批完成,账单解冻 | ||||
| WxBillSettle settle = wxBillSettleService.getById(businessId,EnumFilter.NO.getCode()); | |||||
| WxBillSettle settle = wxBillSettleService.getById(businessId, EnumFilterSettle.NO.getCode()); | |||||
| if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { | if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { | ||||
| wxBillSettle.setStatus(EnumSettleStatus.NOT_FINISH.getCode()); | wxBillSettle.setStatus(EnumSettleStatus.NOT_FINISH.getCode()); | ||||
| wxBillSettleService.updateFreezeOrStatus(settle.getReceiveBillIds(), EnumFreezeType.DEF.getCode(),EnumBillRentStatus.PAID.getCode()); | wxBillSettleService.updateFreezeOrStatus(settle.getReceiveBillIds(), EnumFreezeType.DEF.getCode(),EnumBillRentStatus.PAID.getCode()); | ||||
| @@ -105,7 +105,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { | |||||
| Integer billTypeValue = ((Long) bill.get("billTypeValue")).intValue(); | Integer billTypeValue = ((Long) bill.get("billTypeValue")).intValue(); | ||||
| if(EnumBillType.SETTLE.getCode().equals(billTypeValue)){ | if(EnumBillType.SETTLE.getCode().equals(billTypeValue)){ | ||||
| WxBillSettle wxBillSettle = wxBillSettleService.getById(record.getBillId(),EnumFilter.NO.getCode()); | |||||
| WxBillSettle wxBillSettle = wxBillSettleService.getById(record.getBillId(), EnumFilterSettle.NO.getCode()); | |||||
| owe = wxBillSettle.getBalance(); | owe = wxBillSettle.getBalance(); | ||||
| bill.put("owe",owe); | bill.put("owe",owe); | ||||
| logger.info("wxBillSettle.balance:{}",owe); | logger.info("wxBillSettle.balance:{}",owe); | ||||