winter 1 год назад
Родитель
Сommit
215dbccc45
15 измененных файлов: 35 добавлений и 3743 удалений
  1. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java
  2. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  3. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java
  4. +0
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java
  5. +0
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java
  6. +4
    -10
      mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java
  7. +0
    -169
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java
  8. +0
    -80
      mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java
  9. +0
    -95
      mallinkService/src/main/java/com/iformall/service/WxBillAllService.java
  10. +0
    -4
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  11. +0
    -2265
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  12. +0
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  13. +31
    -34
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  14. +0
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java
  15. +0
    -1068
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 0
- 1
mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java Просмотреть файл

@@ -14,7 +14,6 @@ import com.iformall.domain.vo.WxBillExcelTemplate;
import com.iformall.domain.vo.WxBillExcelTemplateOther; import com.iformall.domain.vo.WxBillExcelTemplateOther;
import com.iformall.enums.EnumMerchantStatus; import com.iformall.enums.EnumMerchantStatus;
import com.iformall.mapper.WxMerchantMapper; import com.iformall.mapper.WxMerchantMapper;
import com.iformall.service.WxBillAllService;
import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserBasicInfoService;
import com.iformall.service.WxTagsService; import com.iformall.service.WxTagsService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;


+ 0
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java Просмотреть файл

@@ -17,7 +17,6 @@ import com.iformall.domain.po.WxBillPayWay;
import com.iformall.domain.po.WxEnergyFees; import com.iformall.domain.po.WxEnergyFees;
import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.WxUserDataRule;
import com.iformall.domain.vo.WxBillAll;
import com.iformall.domain.vo.WxBillBad; import com.iformall.domain.vo.WxBillBad;
import com.iformall.domain.vo.WxBillExcelTemplate; import com.iformall.domain.vo.WxBillExcelTemplate;
import com.iformall.domain.vo.WxBillHotNotify; import com.iformall.domain.vo.WxBillHotNotify;


+ 0
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java Просмотреть файл

@@ -9,7 +9,6 @@ import com.iformall.domain.po.WxBillSettle;
import com.iformall.domain.po.WxBillSettleRecord; import com.iformall.domain.po.WxBillSettleRecord;
import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.BaseEntity;
import com.iformall.enums.EnumFilterSettle; import com.iformall.enums.EnumFilterSettle;
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;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;


+ 0
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java Просмотреть файл

@@ -14,7 +14,6 @@ import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.WxPayAccountBill;
import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.WxUserDataRule;
import com.iformall.domain.vo.WxBillAll;
import com.iformall.domain.vo.WxBillHotNotify; import com.iformall.domain.vo.WxBillHotNotify;
import com.iformall.enums.EnumBillAllType; import com.iformall.enums.EnumBillAllType;
import com.iformall.enums.EnumBillOweOrNearType; import com.iformall.enums.EnumBillOweOrNearType;
@@ -26,7 +25,6 @@ import com.iformall.enums.EnumMerchantStatus;
import com.iformall.enums.EnumYesOrNo; import com.iformall.enums.EnumYesOrNo;
import com.iformall.service.SysConfigService; import com.iformall.service.SysConfigService;
import com.iformall.service.WxBillActionService; import com.iformall.service.WxBillActionService;
import com.iformall.service.WxBillAllService;
import com.iformall.service.WxBillSettleService; import com.iformall.service.WxBillSettleService;
import com.iformall.service.WxFlowService; import com.iformall.service.WxFlowService;
import com.iformall.service.WxMerchantService; import com.iformall.service.WxMerchantService;


+ 0
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java Просмотреть файл

@@ -20,7 +20,6 @@ import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.po.WxShop; import com.iformall.domain.po.WxShop;
import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.WxUserDataRule;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxBillAll;
import com.iformall.domain.vo.WxBillHotNotify; import com.iformall.domain.vo.WxBillHotNotify;
import com.iformall.domain.vo.WxBillSum; import com.iformall.domain.vo.WxBillSum;
import com.iformall.domain.vo.WxCouponOrderSumVo; import com.iformall.domain.vo.WxCouponOrderSumVo;
@@ -44,7 +43,6 @@ import com.iformall.service.MallUserRoleService;
import com.iformall.service.SysConfigService; import com.iformall.service.SysConfigService;
import com.iformall.service.WxAllBillService; import com.iformall.service.WxAllBillService;
import com.iformall.service.WxBillActionService; import com.iformall.service.WxBillActionService;
import com.iformall.service.WxBillAllService;
import com.iformall.service.WxBillSettleService; import com.iformall.service.WxBillSettleService;
import com.iformall.service.WxChartDataService; import com.iformall.service.WxChartDataService;
import com.iformall.service.WxCouponOrderService; import com.iformall.service.WxCouponOrderService;


+ 4
- 10
mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java Просмотреть файл

@@ -3,9 +3,7 @@ package com.iformall.schedule;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.domain.po.msg.WxMsgRecord;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.mapper.WxBillAllMapper;
import com.iformall.mq.MqBaseProducer; import com.iformall.mq.MqBaseProducer;
import com.iformall.service.WxBillAllService;
import org.apache.commons.collections.map.HashedMap; import org.apache.commons.collections.map.HashedMap;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -28,15 +26,9 @@ public class BillNotificationSchedule {


private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired
private WxBillAllMapper wxBillAllMapper;

@Autowired @Autowired
private MqBaseProducer mqBaseProducer; private MqBaseProducer mqBaseProducer;


@Autowired
WxBillAllService wxBillAllService;

// /** // /**
// * 每天9点执行 // * 每天9点执行
// */ // */
@@ -53,7 +45,8 @@ public class BillNotificationSchedule {


private void sendOweBill() { private void sendOweBill() {
logger.info("查询欠缴账单数据"); logger.info("查询欠缴账单数据");
List<Map<String, Object>> oweBillList = wxBillAllMapper.getOweBill();
//List<Map<String, Object>> oweBillList = wxBillAllMapper.getOweBill();
List<Map<String, Object>> oweBillList = null;
for (Map<String, Object> bill : oweBillList) { for (Map<String, Object> bill : oweBillList) {
String tenantId = bill.get("tenantId").toString(); String tenantId = bill.get("tenantId").toString();
String parentTenantId = bill.get("parentTenantId").toString(); String parentTenantId = bill.get("parentTenantId").toString();
@@ -82,7 +75,8 @@ public class BillNotificationSchedule {


private void sendWaitPayBill() { private void sendWaitPayBill() {
logger.info("查询待缴账单数据"); logger.info("查询待缴账单数据");
List<Map<String, Object>> waitBillList = wxBillAllMapper.getWaitPayBill();
//List<Map<String, Object>> waitBillList = wxBillAllMapper.getWaitPayBill();
List<Map<String, Object>> waitBillList = null;
for (Map<String, Object> bill : waitBillList) { for (Map<String, Object> bill : waitBillList) {
String tenantId = bill.get("tenantId").toString(); String tenantId = bill.get("tenantId").toString();
String parentTenantId = bill.get("parentTenantId").toString(); String parentTenantId = bill.get("parentTenantId").toString();


+ 0
- 169
mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java Просмотреть файл

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

import com.baomidou.mybatisplus.annotation.TableField;
import com.iformall.common.SortColumn;
import com.iformall.domain.po.base.TenantEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import java.util.List;

/**
* @author gongbiao
*/
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class WxBillAll extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value="appId",name="appId")
private String appId;

@io.swagger.annotations.ApiModelProperty(value="商户名称",name="merchantName")
private String merchantName;

@io.swagger.annotations.ApiModelProperty(value="账单类型",name="billTypeValue")
private Integer billTypeValue;

@io.swagger.annotations.ApiModelProperty(value="状态",name="status")
private Integer status;

@io.swagger.annotations.ApiModelProperty(value="日期",name="month")
private String month;

@io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime")
private String starttime;

@io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime")
private String endtime;

@io.swagger.annotations.ApiModelProperty(value="商户Id",name="merchantId")
private Long merchantId;

@TableField(exist = false)
private String statusListStr;
@TableField(exist = false)
private String typeListStr;

@io.swagger.annotations.ApiModelProperty(value="多个状态",name="statusList")
private List<Integer> statusList;

@io.swagger.annotations.ApiModelProperty(value="多个账单类型",name="typeList")
private List<Integer> typeList;

@io.swagger.annotations.ApiModelProperty(value="页码",name="pageIndex")
private Integer pageIndex;

@io.swagger.annotations.ApiModelProperty(value="条数",name="pageSize")
private Integer pageSize;

@io.swagger.annotations.ApiModelProperty(value="id",name="id")
private Long id;

@io.swagger.annotations.ApiModelProperty(value = "租赁店铺类型", name = "rentShopType")
private Integer rentShopType;

//费用收缴数据
@io.swagger.annotations.ApiModelProperty(value = "欠缴租金", name = "rentOwe")
@SortColumn(column = "rentOwe")
private Integer rentOwe;
@io.swagger.annotations.ApiModelProperty(value = "欠缴物业费", name = "propertyOwe")
@SortColumn(column = "propertyOwe")
private Integer propertyOwe;
@io.swagger.annotations.ApiModelProperty(value = "欠缴押金", name = "depositOwe")
@SortColumn(column = "depositOwe")
private Integer depositOwe;
@io.swagger.annotations.ApiModelProperty(value = "欠缴其他费用", name = "otherOwe")
@SortColumn(column = "otherOwe")
private Integer otherOwe;
@io.swagger.annotations.ApiModelProperty(value = "欠缴总额", name = "totalOwe")
@SortColumn(column = "totalOwe")
private Integer totalOwe;

private List<Integer> billTypeList;
private List<Long> merchantIdList;

@TableField(exist = false)
@SortColumn(column = "rentReceivePay")
private Integer rentReceivePay;
@TableField(exist = false)
@SortColumn(column = "propertyReceivePay")
private Integer propertyReceivePay;
@TableField(exist = false)
@SortColumn(column = "depositReceivePay")
private Integer depositReceivePay;
@TableField(exist = false)
@SortColumn(column = "otherReceivePay")
private Integer otherReceivePay;
@TableField(exist = false)
@SortColumn(column = "totalReceivePay")
private Integer totalReceivePay;
@TableField(exist = false)
@SortColumn(column = "shopNumber")
private String shopNumber;
@TableField(exist = false)
@SortColumn(column = "receivePay")
private Integer receivePay;
@TableField(exist = false)
@SortColumn(column = "pay")
private Integer pay;
@TableField(exist = false)
@SortColumn(column = "owe")
private Integer owe;
@TableField(exist = false)
private String receiveDate;
@TableField(exist = false)
@SortColumn(column = "payDate")
private String payDate;


@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "过滤已收金额1过滤", name = "filterHasPay")
private Integer filterHasPay;


@io.swagger.annotations.ApiModelProperty(value = "金额旧值", name = "oldPrice")
private Long oldPrice;
@io.swagger.annotations.ApiModelProperty(value = "金额新值", name = "newPrice")
private Long newPrice;
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "B端上传的小票图片", name = "payImg")
private String payImg;

//滞纳金
@TableField(exist = false)
private Long oldLatePrice;
@TableField(exist = false)
private Long newLatePrice;

@TableField(exist = false)
@SortColumn(column = "payOut")
private Integer payOut;

@TableField(exist = false)
private Integer balance;


@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "冻结状态0正常1冻结", name = "freeze")
private Integer freeze;

@io.swagger.annotations.ApiModelProperty(value = "多个类型", name = "typeStr")
private String typeStr;


@TableField(exist = false)
private Integer servicePayRate;

@TableField(exist = false)
private Integer limitStart;
@TableField(exist = false)
private Integer limitEnd;
@TableField(exist = false)
private Integer manageFeeType;
@TableField(exist = false)
private String billTypeName;

}

+ 0
- 80
mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java Просмотреть файл

@@ -1,80 +0,0 @@
package com.iformall.mapper;

import com.iformall.domain.vo.WxBillAll;
import com.iformall.domain.vo.WxBillAllVo;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;

/**
* @author gongbiao
*/
public interface WxBillAllMapper {


List<WxBillAllVo> listRentBill(WxBillAll record);
List<WxBillAllVo> listRentDepositBill(WxBillAll record);
List<WxBillAllVo> listPropertyBill(WxBillAll record);
List<WxBillAllVo> listPropertyDepositBill(WxBillAll record);
List<WxBillAllVo> listDailyBill(WxBillAll record);
List<WxBillAllVo> listOtherBill(WxBillAll record);
List<WxBillAllVo> listOtherDepositBill(WxBillAll record);
List<WxBillAllVo> listRentManageBill(WxBillAll record);
Map<String,Object> queryOweInfo(WxBillAll record);

Map<String,Object> queryPaidInfo(WxBillAll record);

List<Map<String,Object>> listRentBillData(WxBillAll wxBillAll);
List<Map<String,Object>> listRentManageBillData(WxBillAll wxBillAll);
List<Map<String,Object>> listRentDepositBillData(WxBillAll wxBillAll);
List<Map<String,Object>> listPropertyBillData(WxBillAll wxBillAll);
List<Map<String,Object>> listPropertyDepositBillData(WxBillAll wxBillAll);
List<Map<String,Object>> listDailyBillData(WxBillAll wxBillAll);
List<Map<String,Object>> listOtherBillData(WxBillAll wxBillAll);
List<Map<String,Object>> listOtherDepositBillData(WxBillAll wxBillAll);
List<Map<String,Object>> listSettleBillData(WxBillAll wxBillAll);
Map<String,Object> detailRentBillData(@Param("id")Long id);
Map<String,Object> detailRentDepositBillData(@Param("id")Long id);
Map<String,Object> detailPropertyBillData(@Param("id")Long id);
Map<String,Object> detailPropertyDepositBillData(@Param("id")Long id);
Map<String,Object> detailDailyBillData(@Param("id")Long id);
Map<String,Object> detailOtherBillData(@Param("id")Long id);
Map<String,Object> detailOtherDepositBillData(@Param("id")Long id);
List<Map<String, Object>> getWaitPayBill();

List<Map<String, Object>> getOweBill();

/**
* +group by账单类型
* @return
*/
List<Map<String, Object>> getOweBillForEmail();

/**
* +group by账单类型
* @return
*/
List<Map<String, Object>> getWaitPayBillForEmail();

/**
* 欠缴商户分页列表
* @return
*/
List<Map<String, Object>> getOweBillAsPage(WxBillAll record);

/**
* 应收和承付商户分页列表
*
* @return
*/
List<Map<String, Object>> getReceiveAndPayBillAsPage(WxBillAll record);

Map<String, Object> getReceiveAndPayBillDetail(WxBillAll record);

List<WxBillAllVo> allDepositList(WxBillAll wxBillAll);

}

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

@@ -1,95 +0,0 @@
package com.iformall.service;

import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillSettle;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.vo.WxBillAll;
import com.iformall.domain.vo.WxBillAllVo;
import com.iformall.domain.vo.WxBillExcelTemplate;
import com.iformall.domain.vo.WxBillExcelTemplateOther;
import com.iformall.enums.EnumBillAction;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;

/**
* @author gongbiao
*/
@Deprecated
public interface WxBillAllService {

// List<WxBillAllVo> allDepositList(WxBillAll wxBillAll);
//
// Map<String, Object> listAsPage(WxBillAll wxBillAll, Integer pageNum, Integer pageSize);
//
// //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 hasSet,boolean hasShop,boolean hasPayBill,boolean hasReceivePay);
//
// Map<String,Object> detail(Long id,Integer type);
//
// void updateBill(Map<String, Object> bill);
//
// void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillAll wxBillAll);
//
// //Object getBillInfo(WxBillAll wxBillAll);
//
// Long hasOweBill(Long contractId, Integer type);
//
// /**
// * 发送待缴通知邮件
// */
// void sendWaitPayBillEmail();
//
// /**
// * 发送欠缴通知邮件
// */
// void sendOweBillForEmail();
//
// /**
// * 欠缴商户分页列表
// *
// * @return
// */
// Map<String, Object> getOweBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize);
//
//
// /**
// * 应收和承付商户分页列表
// *
// * @return
// */
// PageInfo<Map> getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize);
//
// void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response);
//
// void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response);
//
// void exportWaitMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response);
//
// void updateBillStatus(WxBillAll record);
//
// void exportOweBill(WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response);
//
// void exportSettleBill(WxBillSettle wxBillSettle, HttpServletRequest request, HttpServletResponse response);
//
// ResultData updateReceivePay(WxBillAll wxBillAll, MallUserInfo user,boolean forcePaid);
//
// void addBillAction(EnumBillAction billAction, Long billId, Long oldPrice, Long newPrice, MallUserInfo mallUserInfo);
//
// void exportTemplate(WxBillExcelTemplate wxBillExcelTemplate, HttpServletRequest request, HttpServletResponse response);
//
// void importBill(String importKey, WxBillExcelTemplate bill, MallUserInfo user);
//
// void importBillOther(String importKey, WxBillExcelTemplateOther bill, MallUserInfo user);
//
// Double calcuteSettleBillReceivePay(Long settleId);
//
// void createBillSettleSchedule(Long settleId,Double settleReceivePay);

}

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

@@ -9,7 +9,6 @@ import com.iformall.common.ResultData;
import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.dto.WxCUserBasicInfoDto;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxBillAll;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.mapper.*; import com.iformall.mapper.*;
@@ -64,9 +63,6 @@ public class DataTowerServiceImpl implements DataTowerService {
@Autowired @Autowired
WxRentContractService wxRentContractService; WxRentContractService wxRentContractService;


@Autowired
WxBillAllMapper wxBillAllMapper;

@Autowired @Autowired
WxMsgConfigMapper wxMsgConfigMapper; WxMsgConfigMapper wxMsgConfigMapper;




+ 0
- 2265
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
Разница между файлами не показана из-за своего большого размера
Просмотреть файл


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

@@ -177,8 +177,6 @@ public class WxChartServiceImpl implements WxChartDataService {
@Autowired @Autowired
WxOrderGroupMapper wxOrderGroupMapper; WxOrderGroupMapper wxOrderGroupMapper;
@Autowired @Autowired
WxBillAllMapper wxBillAllMapper;
@Autowired
WxCUserCarMapper wxCUserCarMapper; WxCUserCarMapper wxCUserCarMapper;




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

@@ -13,7 +13,6 @@ import com.iformall.domain.po.msg.MailMsg;
import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.domain.po.msg.WxMsgRecord;
import com.iformall.domain.vo.FlowUserVo; import com.iformall.domain.vo.FlowUserVo;
import com.iformall.domain.vo.UserTaskVo; import com.iformall.domain.vo.UserTaskVo;
import com.iformall.domain.vo.WxBillAll;
import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.domain.vo.WxCouponChannelVo;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.mapper.*; import com.iformall.mapper.*;
@@ -85,8 +84,6 @@ public class WxFlowServiceImpl implements WxFlowService {
@Autowired @Autowired
private WxFlowConfigMapper wxFlowConfigMapper; private WxFlowConfigMapper wxFlowConfigMapper;
@Autowired @Autowired
private WxBillAllService wxBillAllService;
@Autowired
private WxCouponMapper wxCouponMapper; private WxCouponMapper wxCouponMapper;
@Autowired @Autowired
private WxCouponService wxCouponService; private WxCouponService wxCouponService;
@@ -328,37 +325,37 @@ public class WxFlowServiceImpl implements WxFlowService {
Integer billType = getIngeter(getVariableByKey(variables, "billType")); Integer billType = getIngeter(getVariableByKey(variables, "billType"));
if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) {
//账单审批 //账单审批
MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession");
Integer billUpdateType = getIngeter(getVariableByKey(variables, "billUpdateType"));
Long oldPrice = Long.parseLong(getVariableByKey(variables, "oldPrice").toString());
Long newPrice = Long.parseLong(getVariableByKey(variables, "newPrice").toString());
WxBillAll wxBillAll = new WxBillAll();
wxBillAll.setId(Long.parseLong(businessId));
wxBillAll.setBillTypeValue(billType);
if(EnumBillUpdateType.LATEPAY.getCode().equals(billUpdateType)){ //修改滞纳金
wxBillAll.setOldLatePrice(oldPrice);
wxBillAll.setNewLatePrice(newPrice);
}else{
wxBillAll.setOldPrice(oldPrice);
wxBillAll.setNewPrice(newPrice);
}
Integer forcePaidint = Integer.parseInt((getVariableByKey(variables, "forcePaid").toString()));
boolean forcePaid = false;
if (forcePaidint == 1) {
forcePaid = true;
}
//wxBillAllService.updateReceivePay(wxBillAll, user,forcePaid);
//账单修改金额,解冻
List<WxBillSettleBill> billList = new ArrayList<>();
WxBillSettleBill settleBill = new WxBillSettleBill();
settleBill.setBillType(billType);
settleBill.setBillId(Long.parseLong(businessId));
settleBill.setApplyStatus(EnumBillRentApplyStatus.PASSED.getCode());
settleBill.setApplyUpdateTime(new Date());
billList.add(settleBill);
// MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession");
// Integer billUpdateType = getIngeter(getVariableByKey(variables, "billUpdateType"));
// Long oldPrice = Long.parseLong(getVariableByKey(variables, "oldPrice").toString());
// Long newPrice = Long.parseLong(getVariableByKey(variables, "newPrice").toString());
// WxBillAll wxBillAll = new WxBillAll();
// wxBillAll.setId(Long.parseLong(businessId));
// wxBillAll.setBillTypeValue(billType);
// if(EnumBillUpdateType.LATEPAY.getCode().equals(billUpdateType)){ //修改滞纳金
// wxBillAll.setOldLatePrice(oldPrice);
// wxBillAll.setNewLatePrice(newPrice);
// }else{
// wxBillAll.setOldPrice(oldPrice);
// wxBillAll.setNewPrice(newPrice);
// }
//
// Integer forcePaidint = Integer.parseInt((getVariableByKey(variables, "forcePaid").toString()));
// boolean forcePaid = false;
// if (forcePaidint == 1) {
// forcePaid = true;
// }
//
// //wxBillAllService.updateReceivePay(wxBillAll, user,forcePaid);
//
// //账单修改金额,解冻
// List<WxBillSettleBill> billList = new ArrayList<>();
// WxBillSettleBill settleBill = new WxBillSettleBill();
// settleBill.setBillType(billType);
// settleBill.setBillId(Long.parseLong(businessId));
// settleBill.setApplyStatus(EnumBillRentApplyStatus.PASSED.getCode());
// settleBill.setApplyUpdateTime(new Date());
// billList.add(settleBill);
//wxBillSettleService.updateFreezeOrStatus(billList,EnumFreezeType.DEF.getCode(),null,EnumBillRentApplyStatus.PASSED.getCode()); //wxBillSettleService.updateFreezeOrStatus(billList,EnumFreezeType.DEF.getCode(),null,EnumBillRentApplyStatus.PASSED.getCode());
}else if(EnumRentContractAppStatus.APPLYING.getCode().intValue() == applyStatus.intValue()) { }else if(EnumRentContractAppStatus.APPLYING.getCode().intValue() == applyStatus.intValue()) {
//账单修改金额,冻结 //账单修改金额,冻结


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

@@ -8,10 +8,8 @@ import com.iformall.common.IdWorker;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.vo.WxBillAll;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxBillAllMapper;
import com.iformall.mapper.WxMerchantBUserMapper; import com.iformall.mapper.WxMerchantBUserMapper;
import com.iformall.mapper.WxPayAccountBillMapper; import com.iformall.mapper.WxPayAccountBillMapper;
import com.iformall.mapper.WxPayBillMapper; import com.iformall.mapper.WxPayBillMapper;
@@ -49,13 +47,6 @@ public class WxPayBillServiceImpl implements WxPayBillService {
@Autowired @Autowired
WxPayBillMapper wxPayBillMapper; WxPayBillMapper wxPayBillMapper;


@Autowired
WxBillAllMapper wxBillAllMapper;

@Lazy
@Autowired
WxBillAllService wxBillAllService;

@Autowired @Autowired
WxMerchantBUserMapper wxMerchantBUserMapper; WxMerchantBUserMapper wxMerchantBUserMapper;




+ 0
- 1068
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml
Разница между файлами не показана из-за своего большого размера
Просмотреть файл


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