Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
c4402393b9
10 changed files with 312 additions and 216 deletions
  1. +231
    -189
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java
  3. +32
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillJianMian.java
  4. +2
    -11
      mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java
  5. +3
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBillActionMapper.java
  6. +3
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillActionService.java
  7. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java
  8. +9
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  9. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java
  10. +23
    -4
      mallinkService/src/main/resources/mapper/WxBillActionMapper.xml

+ 231
- 189
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java View File

@@ -11,12 +11,14 @@ import com.iformall.controller.base.BillBaseController;
import com.iformall.domain.dto.WxBillPayDTO;
import com.iformall.domain.dto.WxBillReceiveUpdateDTO;
import com.iformall.domain.po.SysConfig;
import com.iformall.domain.po.WxBillAction;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxUserDataRule;
import com.iformall.domain.po.base.WxBillBaseEntity;
import com.iformall.domain.vo.WxBillAll;
import com.iformall.domain.vo.WxBillExcelTemplate;
import com.iformall.domain.vo.WxBillHotNotify;
import com.iformall.domain.vo.WxBillJianMian;
import com.iformall.domain.vo.WxBillSum;
import com.iformall.domain.vo.WxMerchantBillVo;
import com.iformall.enums.EnumBillAllType;
@@ -26,6 +28,7 @@ import com.iformall.enums.EnumRentContractManageFeeType;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.service.ExcelService;
import com.iformall.service.SysConfigService;
import com.iformall.service.WxBillActionService;
import com.iformall.service.WxBillAllService;
import com.iformall.service.WxMerchantService;
import com.iformall.service.WxPayAccountBillService;
@@ -42,6 +45,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -71,6 +76,9 @@ public class WxBillAllController extends BillBaseController {
@Autowired
ExcelService excelService;
@Autowired
private WxBillActionService wxBillActionService;
/**
* 商户账单汇总计费列表
* @param wxMerchant
@@ -555,118 +563,152 @@ public class WxBillAllController extends BillBaseController {
//return wxBillAllService.updateReceivePay(wxBillAll, getUser(),false);
}
//###################################### 老代码 ######################################
@GetMapping("exportOweBill")
@SystemControllerLog(description = "费用收缴数据-生成催缴单")
public void exportOweBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::exportOweBill");
if (null == wxBillAll) {
wxBillAll = new WxBillAll();
}
//默认查当月第一天到今天
if (StringUtils.isNotBlank(wxBillAll.getEndtime())) {
wxBillAll.setEndtime(wxBillAll.getEndtime() + " 23:59:59");
}
wxBillAll.updateTenantInfo(getTenantInfo());
wxBillAllService.exportOweBill(wxBillAll, request, response);
}
/**
* 欠缴商户列表
* @param wxBillAll
* @param pageNum
* @param pageSize
* @return
*/
@GetMapping("oweMerchantlist")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "费用收缴数据-欠缴商户列表")
public ResultData oweMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::oweMerchantlist");
if (null == wxBillAll) {
wxBillAll = new WxBillAll();
}
//默认查当月第一天到今天
if(StringUtils.isNotBlank(wxBillAll.getEndtime())){
wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59");
}
wxBillAll.updateTenantInfo(getTenantInfo());
Map<String, Object> result = wxBillAllService.getOweBillAsPage(wxBillAll, pageNum, pageSize);
return new ResultData(result);
//减免统计
@GetMapping("jianmiantj")
public ResultData jianmiantj(@ModelAttribute WxBillAction wxBillAction) {
wxBillAction.updateTenantInfo(getTenantInfo());
List<WxBillJianMian> jList = wxBillActionService.findJianMian(wxBillAction);
Map<Integer,String> map = new HashMap<Integer,String>();
if (null != jList && jList.size() > 0 ) {
for (int i = 0 ; i < jList.size() ; i++) {
WxBillJianMian jm = jList.get(i);
map.put(jm.getBillType(), jm.getTotal());
}
}
Map retMap = new HashMap();
BigDecimal total = new BigDecimal("0.00");
List<WxBillJianMian> retList = new ArrayList<WxBillJianMian>();
for (EnumBillAllType at : EnumBillAllType.values()) {
String money = map.get(at.getCode());
if (StringUtils.isBlank(money)) {
money = "0.00";
}
WxBillJianMian bjm = new WxBillJianMian();
bjm.setBillType(at.getCode());
bjm.setTotal(money);
retList.add(bjm);
total = total.add(new BigDecimal(money));
}
retMap.put("total", total.toPlainString());
retMap.put("list", retList);
return new ResultData(retMap);
}

@GetMapping("oweBillCount")
@ApiImplicitParams({
@ApiImplicitParam(name = "contractId", value = "合同id", dataType = "long", paramType = "query", required = true),
@ApiImplicitParam(name = "type", value = "类型1租赁合同2物业合同", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "账单总览-总额")
public ResultData oweBillCount(Long contractId, Integer type) {
Long count = wxBillAllService.hasOweBill(contractId, type);
return new ResultData(count);
}

@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "账单总览-列表")
public ResultData list(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::list");
wxBillAll.updateTenantInfo(getTenantInfo());
if (null == wxBillAll) {
wxBillAll = new WxBillAll();
}
wxBillAll.updateTenantInfo(getTenantInfo());
if(StringUtils.isNotBlank(wxBillAll.getStatusListStr())){
wxBillAll.setStatusList(new ArrayList<>());
JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getStatusListStr());
for (int i = 0; i <jsonArray.size() ; i++) {
Integer o = (Integer) jsonArray.get(i);
wxBillAll.getStatusList().add(o);
}
}
if(StringUtils.isNotBlank(wxBillAll.getTypeListStr())){
wxBillAll.setTypeList(new ArrayList<>());
JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getTypeListStr());
for (int i = 0; i <jsonArray.size() ; i++) {
Integer o = (Integer) jsonArray.get(i);
wxBillAll.getTypeList().add(o);
}
}
Map<String, Object> result = wxBillAllService.listAsPage(wxBillAll, pageNum, pageSize);
return new ResultData(result);
}
@GetMapping("detail")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "编号", dataType = "long", paramType = "query", required = true),
@ApiImplicitParam(name = "type", value = "类型", dataType = "int", paramType = "query", required = true)})
public ResultData detail( Long id, Integer type) {
Map<String, Object> result = wxBillAllService.detail(id, type);
Long merchantId = (Long) result.get("merchantId");
WxMerchant merchant = wxMerchantService.getById(merchantId);
if (null != merchant) {
result.put("merchantName", merchant.getName());
}
return new ResultData(result);
}

@GetMapping("allDepositList")
@SystemControllerLog(description = "账单总览-所有押金列表")
public ResultData allDepositList(@ModelAttribute WxBillAll wxBillAll) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::allDepositList");
if (null == wxBillAll) {
wxBillAll = new WxBillAll();
}
wxBillAll.updateTenantInfo(getTenantInfo());
return new ResultData(wxBillAllService.allDepositList(wxBillAll));
}
//###################################### 老代码 ######################################
//
// @GetMapping("exportOweBill")
// @SystemControllerLog(description = "费用收缴数据-生成催缴单")
// public void exportOweBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) {
// logger.debug("[" + getIpAddr() + "] WxBillAllController::exportOweBill");
// if (null == wxBillAll) {
// wxBillAll = new WxBillAll();
// }
// //默认查当月第一天到今天
// if (StringUtils.isNotBlank(wxBillAll.getEndtime())) {
// wxBillAll.setEndtime(wxBillAll.getEndtime() + " 23:59:59");
// }
// wxBillAll.updateTenantInfo(getTenantInfo());
//
// wxBillAllService.exportOweBill(wxBillAll, request, response);
// }
//
// /**
// * 欠缴商户列表
// * @param wxBillAll
// * @param pageNum
// * @param pageSize
// * @return
// */
// @GetMapping("oweMerchantlist")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
// @SystemControllerLog(description = "费用收缴数据-欠缴商户列表")
// public ResultData oweMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) {
// logger.debug("[" + getIpAddr() + "] WxBillAllController::oweMerchantlist");
// if (null == wxBillAll) {
// wxBillAll = new WxBillAll();
// }
// //默认查当月第一天到今天
// if(StringUtils.isNotBlank(wxBillAll.getEndtime())){
// wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59");
// }
// wxBillAll.updateTenantInfo(getTenantInfo());
// Map<String, Object> result = wxBillAllService.getOweBillAsPage(wxBillAll, pageNum, pageSize);
// return new ResultData(result);
// }
//
//
//
// @GetMapping("oweBillCount")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "contractId", value = "合同id", dataType = "long", paramType = "query", required = true),
// @ApiImplicitParam(name = "type", value = "类型1租赁合同2物业合同", dataType = "int", paramType = "query", required = true)})
// @SystemControllerLog(description = "账单总览-总额")
// public ResultData oweBillCount(Long contractId, Integer type) {
// Long count = wxBillAllService.hasOweBill(contractId, type);
// return new ResultData(count);
// }
//
// @GetMapping("list")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
// @SystemControllerLog(description = "账单总览-列表")
// public ResultData list(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) {
// logger.debug("[" + getIpAddr() + "] WxBillAllController::list");
// wxBillAll.updateTenantInfo(getTenantInfo());
// if (null == wxBillAll) {
// wxBillAll = new WxBillAll();
// }
// wxBillAll.updateTenantInfo(getTenantInfo());
// if(StringUtils.isNotBlank(wxBillAll.getStatusListStr())){
// wxBillAll.setStatusList(new ArrayList<>());
// JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getStatusListStr());
// for (int i = 0; i <jsonArray.size() ; i++) {
// Integer o = (Integer) jsonArray.get(i);
// wxBillAll.getStatusList().add(o);
// }
// }
// if(StringUtils.isNotBlank(wxBillAll.getTypeListStr())){
// wxBillAll.setTypeList(new ArrayList<>());
// JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getTypeListStr());
// for (int i = 0; i <jsonArray.size() ; i++) {
// Integer o = (Integer) jsonArray.get(i);
// wxBillAll.getTypeList().add(o);
// }
// }
// Map<String, Object> result = wxBillAllService.listAsPage(wxBillAll, pageNum, pageSize);
// return new ResultData(result);
// }
//
// @GetMapping("detail")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "id", value = "编号", dataType = "long", paramType = "query", required = true),
// @ApiImplicitParam(name = "type", value = "类型", dataType = "int", paramType = "query", required = true)})
// public ResultData detail( Long id, Integer type) {
// Map<String, Object> result = wxBillAllService.detail(id, type);
// Long merchantId = (Long) result.get("merchantId");
// WxMerchant merchant = wxMerchantService.getById(merchantId);
// if (null != merchant) {
// result.put("merchantName", merchant.getName());
// }
// return new ResultData(result);
// }
//
// @GetMapping("allDepositList")
// @SystemControllerLog(description = "账单总览-所有押金列表")
// public ResultData allDepositList(@ModelAttribute WxBillAll wxBillAll) {
// logger.debug("[" + getIpAddr() + "] WxBillAllController::allDepositList");
// if (null == wxBillAll) {
// wxBillAll = new WxBillAll();
// }
// wxBillAll.updateTenantInfo(getTenantInfo());
// return new ResultData(wxBillAllService.allDepositList(wxBillAll));
// }


// @GetMapping("getBillInfo")
@@ -678,86 +720,86 @@ public class WxBillAllController extends BillBaseController {
// }


/**
* 应收、承付商户列表
* @param wxBillAll
* @param pageNum
* @param pageSize
* @return
*/
@GetMapping("receiveAndPayMerchantlist")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "账单管理-应收、承付商户列表")
@ApiOperation("应收、承付商户列表")
public ResultData receiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::receiveAndPayMerchantlist");
if (null == wxBillAll) {
wxBillAll = new WxBillAll();
}
wxBillAll.updateTenantInfo(getTenantInfo());
PageInfo<Map> page = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize);
Map<String, Object> result = new HashMap<>();
result.put("pageInfo", page);
return new ResultData(result);
}
/**
* 导出应收、承付商户列表
* @param wxBillAll
* @return
*/
@GetMapping("exportReceiveAndPayMerchantlist")
@SystemControllerLog(description = "账单管理-导出应收、承付商户列表")
@ApiOperation("导出应收、承付商户列表")
public void exportReceiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll,HttpServletRequest request, HttpServletResponse response) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::exportReceiveAndPayMerchantlist");
if (null == wxBillAll) {
wxBillAll = new WxBillAll();
}
wxBillAll.updateTenantInfo(getTenantInfo());
wxBillAllService.exportReceiveAndPayBillAsPage(wxBillAll, request,response);
}
@ApiOperation("导出欠缴商户列表")
@GetMapping("/exportOweMerchantlist")
@SystemControllerLog(description = "费用收缴数据-欠缴商户列表-导出")
public void exportOweMerchantlist(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::exportOweMerchantlist");
if (null == wxBillAll){
wxBillAll = new WxBillAll();
}
//默认查当月第一天到今天
if(StringUtils.isNotBlank(wxBillAll.getEndtime())){
wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59");
}
wxBillAll.updateTenantInfo(getTenantInfo());
wxBillAllService.exportOweMerchant(wxBillAll, request, response);
}
@ApiOperation("导出待缴商户列表")
@GetMapping("/exportWaitMerchantlist")
@SystemControllerLog(description = "费用收缴数据-待缴商户列表-导出")
public void exportWaitMerchantlist(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::exportWaitMerchantlist");
if (null == wxBillAll){
wxBillAll = new WxBillAll();
}
//默认查当月第一天到今天
if(StringUtils.isNotBlank(wxBillAll.getEndtime())){
wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59");
}
wxBillAll.updateTenantInfo(getTenantInfo());
wxBillAllService.exportWaitMerchant(wxBillAll, request, response);
}
@GetMapping("exportTemplate")
@SystemControllerLog(description = "账单-导出模板")
public void exportTemplate(@ModelAttribute WxBillExcelTemplate wxBillExcelTemplate, HttpServletRequest request, HttpServletResponse response) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::exportTemplate");
wxBillAllService.exportTemplate(wxBillExcelTemplate, request, response);
}
// /**
// * 应收、承付商户列表
// * @param wxBillAll
// * @param pageNum
// * @param pageSize
// * @return
// */
// @GetMapping("receiveAndPayMerchantlist")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
// @SystemControllerLog(description = "账单管理-应收、承付商户列表")
// @ApiOperation("应收、承付商户列表")
// public ResultData receiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) {
// logger.debug("[" + getIpAddr() + "] WxBillAllController::receiveAndPayMerchantlist");
// if (null == wxBillAll) {
// wxBillAll = new WxBillAll();
// }
// wxBillAll.updateTenantInfo(getTenantInfo());
// PageInfo<Map> page = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize);
// Map<String, Object> result = new HashMap<>();
// result.put("pageInfo", page);
// return new ResultData(result);
// }
//
// /**
// * 导出应收、承付商户列表
// * @param wxBillAll
// * @return
// */
// @GetMapping("exportReceiveAndPayMerchantlist")
// @SystemControllerLog(description = "账单管理-导出应收、承付商户列表")
// @ApiOperation("导出应收、承付商户列表")
// public void exportReceiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll,HttpServletRequest request, HttpServletResponse response) {
// logger.debug("[" + getIpAddr() + "] WxBillAllController::exportReceiveAndPayMerchantlist");
// if (null == wxBillAll) {
// wxBillAll = new WxBillAll();
// }
// wxBillAll.updateTenantInfo(getTenantInfo());
// wxBillAllService.exportReceiveAndPayBillAsPage(wxBillAll, request,response);
// }
//
//
// @ApiOperation("导出欠缴商户列表")
// @GetMapping("/exportOweMerchantlist")
// @SystemControllerLog(description = "费用收缴数据-欠缴商户列表-导出")
// public void exportOweMerchantlist(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) {
// logger.debug("[" + getIpAddr() + "] WxBillAllController::exportOweMerchantlist");
// if (null == wxBillAll){
// wxBillAll = new WxBillAll();
// }
// //默认查当月第一天到今天
// if(StringUtils.isNotBlank(wxBillAll.getEndtime())){
// wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59");
// }
// wxBillAll.updateTenantInfo(getTenantInfo());
// wxBillAllService.exportOweMerchant(wxBillAll, request, response);
// }
//
// @ApiOperation("导出待缴商户列表")
// @GetMapping("/exportWaitMerchantlist")
// @SystemControllerLog(description = "费用收缴数据-待缴商户列表-导出")
// public void exportWaitMerchantlist(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) {
// logger.debug("[" + getIpAddr() + "] WxBillAllController::exportWaitMerchantlist");
// if (null == wxBillAll){
// wxBillAll = new WxBillAll();
// }
// //默认查当月第一天到今天
// if(StringUtils.isNotBlank(wxBillAll.getEndtime())){
// wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59");
// }
// wxBillAll.updateTenantInfo(getTenantInfo());
// wxBillAllService.exportWaitMerchant(wxBillAll, request, response);
// }
//
// @GetMapping("exportTemplate")
// @SystemControllerLog(description = "账单-导出模板")
// public void exportTemplate(@ModelAttribute WxBillExcelTemplate wxBillExcelTemplate, HttpServletRequest request, HttpServletResponse response) {
// logger.debug("[" + getIpAddr() + "] WxBillAllController::exportTemplate");
// wxBillAllService.exportTemplate(wxBillExcelTemplate, request, response);
// }

}

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java View File

@@ -42,7 +42,7 @@ public class WxBillAction extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "手机号", name = "phone")
private String phone;

@io.swagger.annotations.ApiModelProperty(value = "动作", name = "action")
@io.swagger.annotations.ApiModelProperty(value = "动作 EnumBillAction", name = "action")
private Integer action;

@io.swagger.annotations.ApiModelProperty(value = "描述", name = "details")


+ 32
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxBillJianMian.java View File

@@ -0,0 +1,32 @@
package com.iformall.domain.vo;

import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Date;

import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.annotation.TableField;
import com.iformall.enums.EnumBillAllType;

@Data
public class WxBillJianMian implements Serializable {

private static final long serialVersionUID = 1L;

//账单类型
private Integer billType;
@TableField(exist = false)
private String billTypeName;
//减免总金额
private String total = "0";
public String getBillTypeName() {
if (null != billType) {
return EnumBillAllType.getEnum(billType).getMessage();
}
return "";
}
}

+ 2
- 11
mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java View File

@@ -7,14 +7,11 @@ package com.iformall.enums;

public enum EnumBillAction {
SELF_SERVICE_PAY(1, "自助缴费"),
UPDATE_BILL(2, "变更账单"),
UPDATE_BILL(2, "账单金额变更"),
OFFLINE_PAY(3, "线下缴费"),
DEPOSIT_PAY(4, "押金缴费"),
DEPOSIT_RETURN(5, "押金退款"),
DEPOSIT_MODIFY(6, "押金变更"),
IMPORT_PAY(10, "导入缴费"),
//IMPORT_PAY(10, "导入缴费"),
UPDATE_LATE_PAY_MONEY(7, "滞纳金变更"),
UPDATE_SETTLE_MONEY(8, "结算单清算"),
UPDATE_SERVICE_MONEY(9, "手续费变更"),
NOTIFY(10,"催缴");

@@ -61,16 +58,10 @@ public enum EnumBillAction {
sb.append(pw.getMessage()).append("支付");
}
sb.append(newMoney).append("元");
}else if (code.intValue() == DEPOSIT_PAY.code.intValue()) {
sb.append(newMoney).append("元");
}else if (code.intValue() == DEPOSIT_RETURN.code.intValue()) {
sb.append(newMoney).append("元");
}else if (code.intValue() == DEPOSIT_MODIFY.code.intValue()) {
sb.append("应付金额").append(oldMoney).append("元变更成").append(newMoney).append("元");
}else if (code.intValue() == UPDATE_LATE_PAY_MONEY.code.intValue()) {
sb.append("应付金额").append(oldMoney).append("元变更成").append(newMoney).append("元");
}else if (code.intValue() == UPDATE_SETTLE_MONEY.code.intValue()) {
sb.append("应付金额").append(oldMoney).append("元变更成").append(newMoney).append("元");
}else if (code.intValue() == UPDATE_SERVICE_MONEY.code.intValue()) {
sb.append("应付金额").append(oldMoney).append("元变更成").append(newMoney).append("元");
}else if (code.intValue() == NOTIFY.code.intValue()) {


+ 3
- 0
mallinkService/src/main/java/com/iformall/mapper/WxBillActionMapper.java View File

@@ -3,6 +3,7 @@ package com.iformall.mapper;
import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxBillAction;
import com.iformall.domain.po.WxShop;
import com.iformall.domain.vo.WxBillJianMian;

import java.util.List;

@@ -14,4 +15,6 @@ public interface WxBillActionMapper extends CommonMapper<WxBillAction, Long> {
List<WxShop> findList(WxBillAction wxBillAction);

List<WxBillAction> findBillActionList(WxBillAction wxBillAction);
List<WxBillJianMian> findJianMian(WxBillAction record);
}

+ 3
- 0
mallinkService/src/main/java/com/iformall/service/WxBillActionService.java View File

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillAction;
import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.vo.WxBillJianMian;

import java.util.List;

@@ -21,4 +22,6 @@ public interface WxBillActionService {
int modifyBill(WxBillAction wxBillAction, WxMerchantBUser bUser);

List<WxBillAction> find(WxBillAction record);
List<WxBillJianMian> findJianMian(WxBillAction record);
}

+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java View File

@@ -7,6 +7,7 @@ import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillAction;
import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxBillJianMian;
import com.iformall.mapper.WxBillActionMapper;
import com.iformall.service.WxBillActionService;
import org.slf4j.Logger;
@@ -83,4 +84,9 @@ public class WxBillActionServiceImpl implements WxBillActionService {
return modifyBillByUser(bUser,action,bUser.getId(),bUser.getName(),bUser.getPhone());
}

@Override
public List<WxBillJianMian> findJianMian(WxBillAction record) {
return wxBillActionMapper.findJianMian(record);
}

}

+ 9
- 9
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java View File

@@ -1847,15 +1847,15 @@ public class WxBillAllServiceImpl implements WxBillAllService {
// stringRedisTemplate.expire(importKey, 10, TimeUnit.SECONDS);
}

public void addActionImport(Long billId, String payWay, Date payDate, MallUserInfo user, String pay) {
WxBillAction wxBillAction = new WxBillAction();
wxBillAction.setBillId(billId);
String details = StringUtils.isEmpty(payWay) ? "其他缴费" : payWay + "缴费";
wxBillAction.setDetails(details + pay + "元");
wxBillAction.setAction(EnumBillAction.IMPORT_PAY.getCode());
wxBillAction.setPayDate(payDate);
wxBillActionService.modifyBill(wxBillAction, user);
}
// public void addActionImport(Long billId, String payWay, Date payDate, MallUserInfo user, String pay) {
// WxBillAction wxBillAction = new WxBillAction();
// wxBillAction.setBillId(billId);
// String details = StringUtils.isEmpty(payWay) ? "其他缴费" : payWay + "缴费";
// wxBillAction.setDetails(details + pay + "元");
// wxBillAction.setAction(EnumBillAction.IMPORT_PAY.getCode());
// wxBillAction.setPayDate(payDate);
// wxBillActionService.modifyBill(wxBillAction, user);
// }

public void updateDailyBill(Long businessId, String newPrice, Date updateDate,boolean forcePaid) {
// WxBillDaily dbBill = wxBillDailyMapper.selectById(businessId);


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java View File

@@ -431,7 +431,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil
billDepositNewPrce = dbBill.getPay();
wxBillDepositMapper.updateById(wxBillDeposit);
String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。";
this.addBillAction(EnumBillAction.DEPOSIT_MODIFY, dto.getBillTypeValue(),dto.getId(), billDepositOldPrce,
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), billDepositOldPrce,
billDepositNewPrce,payDate, null, remark, user);
}else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) {
wxBillDeposit.setServiceChargePay(dto.getServiceChargePayUpdate());
@@ -449,7 +449,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil
remark = remark + ";【系统】账单实际应付金额调整至小于等于已付金额,自动归结为结清。";
}
wxBillDepositMapper.updateById(wxBillDeposit);
this.addBillAction(EnumBillAction.DEPOSIT_MODIFY, dto.getBillTypeValue(),dto.getId(), billDepositOldPrce,
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), billDepositOldPrce,
billDepositNewPrce,payDate,payWay,remark, user);
}


+ 23
- 4
mallinkService/src/main/resources/mapper/WxBillActionMapper.xml View File

@@ -52,9 +52,13 @@
<if test=" null != billId ">
and `bill_id` = #{billId}
</if>

<if test=" null != startDate and null != endDate">
and `createtime` BETWEEN startDate and endDate
<if test=" null != startDate">
and `createtime` &gt;= #{startDate}
</if>
<if test=" null != endDate">
and `createtime` &lt;= #{endDate}
</if>
<if test=" null != ids ">
@@ -80,6 +84,21 @@
from wx_bill_action
<include refid="dynamicWhereConditions"/>
</select>

<resultMap id="JianMianResultMap" type="com.iformall.domain.vo.WxBillJianMian">
<result column="bill_type" jdbcType="INTEGER" property="billType"/>
<result column="total" jdbcType="VARCHAR" property="total"/>
</resultMap>
<select id="findJianMian" parameterType="com.iformall.domain.po.WxBillAction" resultMap="JianMianResultMap">
select bill_type,sum(CAST((old_money-new_money) AS DECIMAL(20,2))) total
from wx_bill_action where action = 2
<if test=" null != startDate">
and `createtime` &gt;= #{startDate}
</if>
<if test=" null != endDate">
and `createtime` &lt;= #{endDate}
</if>
group by bill_type
</select>

</mapper>

Loading…
Cancel
Save