From 09c594d216fe94e605bbf6c9f1d6a50bccfb3618 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 4 Sep 2019 13:12:06 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=97=A5=E5=B8=B8=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/WxBillDailyController.java | 2 + .../migration/V201909041150__G_BILL_DAILY.sql | 1 + .../schedule/PowerBillAutoBuildSchedule.java | 1 + .../com/iformall/domain/po/WxBillDaily.java | 4 ++ .../iformall/enums/EnumBillDailyBuildWay.java | 38 +++++++++++++++++++ .../service/impl/WxBillAllServiceImpl.java | 1 + .../resources/mapper/WxBillDailyMapper.xml | 9 ++++- 7 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201909041150__G_BILL_DAILY.sql create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumBillDailyBuildWay.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java index 5237b8269..43212161b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -10,6 +10,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.controller.mem.BillDailyAsyncTask; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillDaily; +import com.iformall.enums.EnumBillDailyBuildWay; import com.iformall.exception.MallinkException; import com.iformall.service.WxBillDailyService; import com.iformall.utils.Constant; @@ -75,6 +76,7 @@ public class WxBillDailyController extends BaseController { MallUserInfo user = getUser(); wxBillDaily.setTenantId(user.getTenantId()); wxBillDaily.setUserId(user.getId()); + wxBillDaily.setBuildWay(EnumBillDailyBuildWay.HAND.getCode()); return wxBillDailyService.saveOrUpdate(wxBillDaily, user); } diff --git a/mallinkAdmin/src/main/resources/db/migration/V201909041150__G_BILL_DAILY.sql b/mallinkAdmin/src/main/resources/db/migration/V201909041150__G_BILL_DAILY.sql new file mode 100644 index 000000000..4054ad487 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201909041150__G_BILL_DAILY.sql @@ -0,0 +1 @@ +alter table wx_bill_daily add column build_way tinyint(3) default 1 comment '创建方式1手动2自动3导入'; \ No newline at end of file diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java index 31265f064..7241c1e13 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java @@ -133,6 +133,7 @@ public class PowerBillAutoBuildSchedule { wxBillDaily.setStarttime(startdate); wxBillDaily.setEndtime(enddate); wxBillDaily.setPriceDetail(priceDetals.toJSONString()); + wxBillDaily.setBuildWay(EnumBillDailyBuildWay.AUTO.getCode()); wxBillDailyService.saveOrUpdate(wxBillDaily, mallUserInfo); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index e19c127cf..d3d57b81d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -108,4 +108,8 @@ public class WxBillDaily extends BaseEntity{ private Date endtime; @io.swagger.annotations.ApiModelProperty(value = "冻结状态,0正常1冻结", name = "freeze") private Integer freeze; + + @io.swagger.annotations.ApiModelProperty(value = "创建方式1手动2自动3导入", name = "buildWay") + private Integer buildWay; + } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillDailyBuildWay.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillDailyBuildWay.java new file mode 100644 index 000000000..0590dfad8 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillDailyBuildWay.java @@ -0,0 +1,38 @@ +package com.iformall.enums; + + +/** + * @author gongbiao + */ + +public enum EnumBillDailyBuildWay { + + HAND(1, "手动"), + AUTO(2, "自动"), + IMPORT(3, "导入"),; + + public static EnumBillDailyBuildWay getEnum(Integer code) { + for (EnumBillDailyBuildWay value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumBillDailyBuildWay(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 819f54665..6543e8dd0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1169,6 +1169,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { WxBillRent expiredDayAndStatus = getExpiredDayAndStatus(bill.getReceiveDate(), bill.getPayDate(), receivePay, pay, false); daily.setExpiredDay(expiredDayAndStatus.getExpiredDay()); daily.setStatus(expiredDayAndStatus.getStatus()); + daily.setBuildWay(EnumBillDailyBuildWay.IMPORT.getCode()); wxBillDailyMapper.insertSelective(daily); if (pay > 0) { addActionImport(daily.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index ba5ff205a..f9d30857e 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -27,13 +27,14 @@ + `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, `tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`type`, - `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze + `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way @@ -56,6 +57,8 @@ and `type` = #{type} and `rent_shop_type` = #{rentShopType} and `pay_way` = #{payWay} + and `build_way` = #{buildWay} + and id in @@ -74,7 +77,7 @@ select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` , case when br.status=1 then br.owe else 0 end owe,br.`status`,m.`name` merchant_name,s.shop_number, br.`updatetime`,br.`merchant_id`,br.shop_id,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail, - br.`starttime`,br.`endtime` + br.`starttime`,br.`endtime`,br.`build_way` from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id @@ -88,6 +91,8 @@ and br.`pay_way` = #{payWay} and br.`receive_date` between #{starttime} and #{endtime} + and br.`build_way` = #{buildWay} +