From 61c47eb78d003465b418d0e6b5b0727e311ca1fa Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 27 Apr 2019 11:27:53 +0800 Subject: [PATCH 01/17] =?UTF-8?q?[=E6=B6=88=E6=81=AF][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0code=E5=85=A5=E5=BA=93]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/po/msg/WxMsgRecord.java | 3 +- .../impl/WxMsgValidationcodeServiceImpl.java | 52 +------------------ .../service/msg/impl/SendSmsServiceImpl.java | 3 ++ 3 files changed, 5 insertions(+), 53 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java index 07119578c..bc5f9c8cd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java @@ -1,12 +1,11 @@ package com.iformall.domain.po.msg; -import com.iformall.domain.po.msg.BaseMsg; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - import javax.persistence.Id; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.Date; import java.util.Map; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java index be0ba10a4..5ef1b6348 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java @@ -86,38 +86,8 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic validationcode.getExpiretime().after(currentdate)).collect(Collectors.toList()); if(wxmsgvalidationcodelist.size()>0) return new ResultData(ErrorCode.MSG_REPEAT_SEND.getCode(),ErrorCode.MSG_REPEAT_SEND.getMessage()); - //2、根据tenantid查询出商场名称作为签名 - /*WxMall wxMall = new WxMall(); - wxMall.setTenantId(wxMsgValidationcode.getTenantId()); - List wxmallist = wxMallMapper.findList(wxMall);*/ - - //3、从短信配置中查询密钥 bid 等信息 -// WxMsgConfig wxMsgConfig = new WxMsgConfig(); -// wxMsgConfig.setTenantId(wxMsgValidationcode.getTenantId()); -// List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); -// if (wxMsgConfigs.size() == 0) new ResultData(ErrorCode.MSG_SEND_ERROR.getCode(),"发送失败"); -// wxMsgConfig = wxMsgConfigs.get(0); -// -// WxMsgValidationcodeModel wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); -// wxMsgValidationcodeModel.setTenantId(wxMsgConfig.getTenantId()); -// wxMsgValidationcodeModel.setType(EnumMsgModel.VALIDATION_CODE.getCode()); -// wxMsgValidationcodeModel = wxMsgValidationcodeModelMapper.findList(wxMsgValidationcodeModel).get(0); -// wxMsgValidationcode.setSignature(wxMsgValidationcodeModel.getSignature()); -// -// String secret = wxMsgConfig.getSecret(); -// String bid = wxMsgConfig.getBid(); -// String publickey = wxMsgConfig.getPublickey(); -// //验证码 + //验证码 int code = (int) ((Math.random() * 9 + 1) * 100000); -// String phone = wxMsgValidationcode.getPhone(); -// String signature = wxMsgValidationcode.getSignature(); -// //内容 -// String msg = wxMsgValidationcodeModel.getContent().replace("{s6}", String.valueOf(code)); -// wxMsgValidationcode.setCode(String.valueOf(code)); -// wxMsgValidationcode.setMsg(msg); -// String notifyUrl = wxMsgConfig.getNotifyurl(); -// Integer modelId = wxMsgValidationcodeModel.getModelId(); - //给发起人发送驳回消息 Map msgReplaceMap = new HashedMap(); @@ -130,26 +100,6 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic wxMsgRecord.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); return new ResultData(Result.SUCCESS,"发送成功"); - -// String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl, EnumVerifyCode.YES.getCode().toString(), modelId); -// JSONObject jsonObjectResult = JSONObject.parseObject(result); -// String ret = jsonObjectResult.get("ret").toString(); -// String batchNo = jsonObjectResult.get("data").toString(); -// if (ret.equals("1")) { -// final IdWorker idWorker = IdWorker.get(); -// wxMsgValidationcode.setId(idWorker.nextId()); -// long currentTime = System.currentTimeMillis() ; -// Date createtime=new Date(currentTime); -// Integer minutes = wxMsgValidationcodeModel.getMinutes(); -// currentTime +=minutes*60*1000; -// Date expiredate=new Date(currentTime); -// wxMsgValidationcode.setExpiretime(expiredate); -// wxMsgValidationcode.setCreatetime(createtime); -// wxMsgValidationcodeMapper.insertSelective(wxMsgValidationcode); -// addMsgCallback(wxMsgValidationcode,batchNo); -// return new ResultData(Result.SUCCESS,"发送成功"); -// } -// return new ResultData(ErrorCode.MSG_SEND_ERROR.getCode(),"发送失败"); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java index aeedeba93..336e46f8a 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java @@ -81,6 +81,9 @@ public class SendSmsServiceImpl implements MsgSendService { msg = msg.replace("{"+entry.getKey()+"}", entry.getValue()); } wxMsgValidationcode.setMsg(msg); + if(record.getDynamicContentMap() !=null) { + wxMsgValidationcode.setCode(record.getDynamicContentMap().get("s6")); + } String notifyUrl = wxMsgConfig.getNotifyurl(); Integer modelId = wxMsgValidationcodeModel.getModelId(); From 48b4f619d997207af701789f3a391728301584bb Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 27 Apr 2019 11:56:55 +0800 Subject: [PATCH 02/17] =?UTF-8?q?[=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E6=AF=8F=E5=A4=A91=E7=82=B9=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E8=B4=A6=E5=8D=95=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/schedule/BillStatusSchedule.java | 48 +++++++++++++++++++ .../java/com/iformall/common/ErrorCode.java | 2 +- .../iformall/service/WxBillAllService.java | 14 ++++-- .../service/impl/WxBillAllServiceImpl.java | 4 +- 4 files changed, 60 insertions(+), 8 deletions(-) create mode 100644 mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java new file mode 100644 index 000000000..962b9a7db --- /dev/null +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java @@ -0,0 +1,48 @@ +package com.iformall.schedule; + +import com.iformall.domain.po.WxMall; +import com.iformall.domain.vo.WxBillAll; +import com.iformall.mapper.WxMallMapper; +import com.iformall.service.WxBillAllService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @author gongbiao + */ +@Component +public class BillStatusSchedule { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxBillAllService wxBillAllService; + + @Autowired + private WxMallMapper wxMallMapper; + + /** + * 每天1点执行 + */ + @Scheduled(cron = "0 0 1 * * ?") + public void updateBillStatus() { + logger.info("账单状态更新开始"); + + List wxMalls = wxMallMapper.findList(null); + for (WxMall wxMall : wxMalls) { + String tenantId = wxMall.getTenantId(); + WxBillAll wxBillAll = new WxBillAll(); + wxBillAll.setTenantId(tenantId); + wxBillAllService.updateBillStatus(wxBillAll); + } + + logger.info("账单状态更新结束"); + } + + +} \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 4b48b62c7..a4cbb0b98 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -239,7 +239,7 @@ public enum ErrorCode{ * 核销 */ VERIFY_ERROR(12050, "核销异常"), - MSG_REPEAT_SEND(12061, "短信重新发送"), + MSG_REPEAT_SEND(12061, "短信重复发送"), /** * 解单 diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index da6d55718..802bd6b65 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -12,19 +12,19 @@ import java.util.Map; */ public interface WxBillAllService { - Map listAsPage(WxBillAll wxBillAll, Integer pageNum, Integer pageSize); + Map listAsPage(WxBillAll wxBillAll, Integer pageNum, Integer pageSize); - List> listBillOweAndWaitPay(WxBillAll wxBillAll); + List> listBillOweAndWaitPay(WxBillAll wxBillAll); ResultData listBill(WxBillAll wxBillAll); - void updateBill(Map bill); + void updateBill(Map bill); void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillAll wxBillAll); Object getBillInfo(WxBillAll wxBillAll); - Long hasOweBill(Long contractId,Integer type); + Long hasOweBill(Long contractId, Integer type); /** * 发送待缴通知邮件 @@ -38,10 +38,14 @@ public interface WxBillAllService { /** * 欠缴商户分页列表 + * * @return */ Map getOweBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize); void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response); -} + + void updateBillStatus(WxBillAll record); + +} \ No newline at end of file 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 c88e44b8b..f23adc733 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -549,8 +549,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { return count; } - - private void updateBillStatus(WxBillAll record) { + @Override + public void updateBillStatus(WxBillAll record) { logger.info("更新各账单状态开始"); //更新其他押金账单 //WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); From 1d08dc6fa17c013c59cba418aa23d9247012cdff Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 27 Apr 2019 12:03:50 +0800 Subject: [PATCH 03/17] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxChartServiceImpl.java | 15 +++++++++------ .../src/main/resources/mapper/WxCouponMapper.xml | 10 +++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 0ae1743cd..22d31b5c8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2294,12 +2294,6 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(datamap); } - public static void main(String[] args) { - double a = 0.0; - System.out.println(a==0.0); - System.out.println(); - } - /** * 费用收缴数据 * @param tenantId @@ -2445,6 +2439,15 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(datamap); } + public static void main(String[] args) { + BigDecimal receivepay = new BigDecimal(33); + BigDecimal pay = new BigDecimal(11); + BigDecimal divide = pay.divide(receivepay, 2, BigDecimal.ROUND_UNNECESSARY); + System.out.println(divide); + double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); + System.out.println(zjcjl); + } + /** * 营销数据 * @param tenantId diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 90fcd493a..44efa7e0f 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -509,21 +509,21 @@ left join wx_coupon c on c.id = ci.coupon_id left join wx_coupon_order co on co.id = ci.id where c.type = 100 - and c.create_date between #{startdate} and #{enddate} + and co.create_date between #{startdate} and #{enddate} @@ -760,7 +760,7 @@ left join wx_coupon c on c.id = ci.coupon_id left join wx_coupon_order co on co.id = ci.id where c.type = 100 - and c.create_date between #{startdate} and #{enddate} + and co.create_date between #{startdate} and #{enddate} group by xtime From f64e460b37efd161e56f5b8b20a409fdd94c51a0 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 27 Apr 2019 13:40:38 +0800 Subject: [PATCH 04/17] =?UTF-8?q?[=E9=AA=8C=E8=AF=81=E7=A0=81=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1][=E6=B7=BB=E5=8A=A0][=E5=88=A4=E6=96=AD=E4=B8=80?= =?UTF-8?q?=E6=97=A5=E5=8F=AA=E8=83=BD=E5=8F=91=E4=B8=89=E6=AC=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V201904271400__UPDATE_MSG_MODEL.sql | 1 + .../com/iformall/domain/po/WxMsgValidationcode.java | 11 +++++++++++ .../impl/WxMsgValidationcodeServiceImpl.java | 12 +++++++++++- .../resources/mapper/WxMsgValidationcodeMapper.xml | 13 +++++++------ 4 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201904271400__UPDATE_MSG_MODEL.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904271400__UPDATE_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201904271400__UPDATE_MSG_MODEL.sql new file mode 100644 index 000000000..f1ebf265b --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201904271400__UPDATE_MSG_MODEL.sql @@ -0,0 +1 @@ +update wx_msg_validationcode_model set content='{s6}(动态验证码),请在5分钟内填写' where type in (1,6); \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java index 81eb923a8..4cc9c3d17 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java @@ -67,6 +67,17 @@ public class WxMsgValidationcode implements Serializable { @io.swagger.annotations.ApiModelProperty(value="",name="appid") private String appid; + @Transient + private String createtimeStr; + + public String getCreatetimeStr() { + return createtimeStr; + } + + public void setCreatetimeStr(String createtimeStr) { + this.createtimeStr = createtimeStr; + } + public String getPhone() { return phone; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java index 5ef1b6348..06ec46fb4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java @@ -12,6 +12,7 @@ import com.iformall.enums.*; import com.iformall.mapper.*; import com.iformall.mq.MqBaseProducer; import com.iformall.service.WxMsgValidationcodeService; +import com.iformall.utils.DateUtils; import org.apache.commons.collections.map.HashedMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -84,7 +85,16 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic Date currentdate = new Date(); wxmsgvalidationcodelist = wxmsgvalidationcodelist.stream().filter(validationcode -> validationcode.getExpiretime().after(currentdate)).collect(Collectors.toList()); - if(wxmsgvalidationcodelist.size()>0) return new ResultData(ErrorCode.MSG_REPEAT_SEND.getCode(),ErrorCode.MSG_REPEAT_SEND.getMessage()); + if (wxmsgvalidationcodelist.size() > 0) { + return new ResultData(ErrorCode.MSG_REPEAT_SEND); + } + //2 判断是否已超过3条 + String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); + wxMsgValidationcode.setCreatetimeStr(systemTime); + List list = wxMsgValidationcodeMapper.findList(wxMsgValidationcode); + if (list.size() == 3) { + return new ResultData(ErrorCode.MSG_SEND_ERROR.getCode(), "验证码发送超限"); + } //验证码 int code = (int) ((Math.random() * 9 + 1) * 100000); diff --git a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeMapper.xml index 02ac52e94..b3791f2b8 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeMapper.xml @@ -22,14 +22,15 @@ where 1 = 1 and `id` = #{id} - and `phone` = #{phone} - and `expiretime` = #{expiretime} - and `createtime` = #{createtime} + and `phone` = #{phone} + and `expiretime` = #{expiretime} + and `createtime` = #{createtime} and `type` = #{type} and `tenant_id` = #{tenantId} - and `msg` = #{msg} - and `signature` = #{signature} - and `code` = #{code} + and `msg` = #{msg} + and `signature` = #{signature} + and `code` = #{code} + and date_format(`createtime`,'%Y-%m-%d') = #{createtimeStr} and id in From 4526d492c7ee42d0117fa7949f531ba39fd508ab Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 27 Apr 2019 13:42:15 +0800 Subject: [PATCH 05/17] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=94=9F=E6=88=90=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E9=9D=9E=E6=AC=A0=E7=BC=B4=E7=8A=B6=E6=80=81=E6=AC=A0=E7=BC=B4?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E9=BB=98=E8=AE=A40]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxPropertyContractServiceImpl.java | 5 +++-- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 53f483357..2e128c251 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -674,7 +674,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } wxBillProperty.setNeedPay(needpay); - wxBillProperty.setOwe(needpay); + wxBillProperty.setOwe(0L); wxBillProperty.setReceivePay(needpay); //截止收租日在当前时间之前 @@ -682,6 +682,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000); wxBillProperty.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); wxBillProperty.setExpiredDay(day); + wxBillProperty.setOwe(needpay); } else {//截止收租日在当前时间之后 Calendar now = Calendar.getInstance(); now.add(dayType, receivePeriod); @@ -695,7 +696,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxBillProperty.setExpiredDay(0L); } } - + wxBillProperty.setRevenue(0L); wxBillProperty.setTenantId(wxMerchant.getTenantId()); wxBillProperty.setIsDel(0); wxBillProperty.setMerchantId(wxMerchant.getId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index b6aa38928..45b29a9cd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1065,7 +1065,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } wxBillRent.setNeedPay(needpay); - wxBillRent.setOwe(needpay); + wxBillRent.setOwe(0L); wxBillRent.setReceivePay(needpay); //截止收租日在当前时间之前 @@ -1073,6 +1073,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000); wxBillRent.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); wxBillRent.setExpiredDay(day); + wxBillRent.setOwe(needpay); } else {//截止收租日在当前时间之后 Calendar now = Calendar.getInstance(); now.add(dayType, receivePeriod); From 771a35ebee93e0ce19a94f0262fa8cd73e4ccee1 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 27 Apr 2019 13:52:49 +0800 Subject: [PATCH 06/17] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=94=9F=E6=88=90=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E9=9D=9E=E6=AC=A0=E7=BC=B4=E7=8A=B6=E6=80=81=E6=AC=A0=E7=BC=B4?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E9=BB=98=E8=AE=A40]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxPropertyContractServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 2e128c251..68a5514c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -696,7 +696,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxBillProperty.setExpiredDay(0L); } } - wxBillProperty.setRevenue(0L); + wxBillProperty.setTenantId(wxMerchant.getTenantId()); wxBillProperty.setIsDel(0); wxBillProperty.setMerchantId(wxMerchant.getId()); From 6a3ca0c49af78b5c3cf93938b7d6a067f27826e3 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 27 Apr 2019 15:25:28 +0800 Subject: [PATCH 07/17] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=BD=95=E5=85=A5=E8=90=A5=E4=B8=9A?= =?UTF-8?q?=E9=A2=9D=E6=97=B6=E5=8F=98=E6=9B=B4=E5=BA=94=E6=94=B6=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E6=B7=BB=E5=8A=A0=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxBillRentController.java | 2 +- .../iformall/service/WxBillRentService.java | 3 +-- .../service/impl/WxBillRentServiceImpl.java | 24 +++++++++++++++++-- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java index ce8b906b2..6c106f8ec 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java @@ -107,7 +107,7 @@ public class WxBillRentController extends BaseController { @SystemControllerLog(description = "租赁押金账单-更新营业额") public ResultData updateRevenue(@RequestBody WxBillRent wxBillRent) { logger.debug("[" + getIpAddr() + "] WxBillRentController::updateRevenue"); - return wxBillRentService.updateRevenue(wxBillRent); + return wxBillRentService.updateRevenue(wxBillRent, getUser()); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index 900a4ecc1..8075e7921 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -4,7 +4,6 @@ import java.util.*; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxBillRent; /** @@ -54,7 +53,7 @@ public interface WxBillRentService { Object detail(Long id); - ResultData updateRevenue(WxBillRent wxBillRent); + ResultData updateRevenue(WxBillRent wxBillRent, MallUserInfo user); ResultData updateLatePayStatus(WxBillRent wxBillRent); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index aa64f95cd..b70ec80d0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -222,11 +222,14 @@ public class WxBillRentServiceImpl implements WxBillRentService { return result; } + @Transactional(rollbackFor = {Exception.class}) @Override - public ResultData updateRevenue(WxBillRent record) { + public ResultData updateRevenue(WxBillRent record, MallUserInfo user) { WxBillRent wxBillRent = wxBillRentMapper.selectByPrimaryKey(record.getId()); + Long oldPrice = wxBillRent.getReceivePay(); + Long newPrice = record.getReceivePay(); wxBillRent.setRevenue(record.getRevenue()); - wxBillRent.setReceivePay(record.getReceivePay()); + wxBillRent.setReceivePay(oldPrice.equals(newPrice) ? oldPrice : newPrice); wxBillRent.setUpdatetime(new Date()); try { wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); @@ -234,6 +237,23 @@ public class WxBillRentServiceImpl implements WxBillRentService { logger.error("修改营业额失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "修改营业额失败"); } + if (!oldPrice.equals(newPrice)) { + //日志 + WxBillAction wxBillAction = new WxBillAction(); + wxBillAction.setBillId(wxBillRent.getId()); + wxBillAction.setDetails("录入营业额时应收金额" + oldPrice + "元变更成" + newPrice + "元"); + wxBillAction.setAction(EnumBillAction.UPDATE_BILL.getCode()); + wxBillAction.setUserId(user.getId()); + wxBillAction.setUserName(user.getName()); + wxBillAction.setPhone(user.getPhone()); + wxBillAction.setTenantId(wxBillRent.getTenantId()); + try { + wxBillActionService.save(wxBillAction); + } catch (Exception e) { + logger.error("添加租赁账单行为日志,e:" + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "修改营业额失败"); + } + } return new ResultData(Result.SUCCESS, "修改营业额成功", wxBillRent); } From e27ea8ceb59e2b17202ee9aa6b2dc12ed29fc6d1 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 27 Apr 2019 13:51:21 +0800 Subject: [PATCH 08/17] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=9D=E6=8A=A4][=E4=BF=AE=E6=94=B9]:=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=95=8F=E6=84=9F=E4=BF=A1=E6=81=AF=E4=BF=9D=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/HomeController.java | 21 +++---------------- .../controller/MallUserInfoController.java | 2 +- .../controller/WechatLoginController.java | 12 ++--------- .../com/iformall/domain/po/MallUserInfo.java | 6 ++++++ 4 files changed, 12 insertions(+), 29 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java index 32f7b0be4..43e219fe8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java @@ -138,12 +138,7 @@ public class HomeController extends BaseController { } if(isLogin) { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); - info.setPassword("保密"); - if(StringUtils.isNotBlank(info.getBopenId())) - info.setBopenId("保密"); - if(StringUtils.isNotBlank(info.getWebOpenId())) { - info.setWebOpenId("保密"); - } + info.protectInfos(); String menus = mallUserRoleService.getPermissionsByUser(info); if(menus != null) { @@ -222,12 +217,7 @@ public class HomeController extends BaseController { UseriFormallToken token = new UseriFormallToken(user.getUsername()); subject.login(token); MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); - info.setPassword("保密"); - if(StringUtils.isNotBlank(info.getBopenId())) - info.setBopenId("保密"); - if(StringUtils.isNotBlank(info.getWebOpenId())) { - info.setWebOpenId("保密"); - } + info.protectInfos(); String menus = mallUserRoleService.getPermissionsByUser(info); if(menus != null) { info.setMenus(menus); @@ -324,12 +314,7 @@ public class HomeController extends BaseController { UseriFormallToken token = new UseriFormallToken(user.getUsername()); subject.login(token); MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); - info.setPassword("保密"); - if(StringUtils.isNotBlank(info.getBopenId())) - info.setBopenId("保密"); - if(StringUtils.isNotBlank(info.getWebOpenId())) { - info.setWebOpenId("保密"); - } + info.protectInfos(); String menus = mallUserRoleService.getPermissionsByUser(info); if(menus != null) { info.setMenus(menus); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java index f980b7d73..73a829591 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java @@ -298,7 +298,7 @@ public class MallUserInfoController extends BaseController { public ResultData getUserInfo() { logger.debug("[" + getIpAddr() + "] MallUserInfoController::getUserInfo"); MallUserInfo info = getUser(); - info.setPassword("保密"); + info.protectInfos(); if (info.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { // isAdmin MallPermission q = new MallPermission(); PageInfo list = mallPermissionService.listAsPage(q, 1, 100); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java index fa984f7bd..8e83ede7d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java @@ -145,11 +145,7 @@ public class WechatLoginController extends BaseController { } if(isLogin) { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); - info.setPassword("保密"); - info.setBopenId("保密"); - if(StringUtils.isNotBlank(info.getWebOpenId())) { - info.setWebOpenId("保密"); - } + info.protectInfos(); String menus = mallUserRoleService.getPermissionsByUser(info); if(menus != null) { info.setMenus(menus); @@ -284,11 +280,7 @@ public class WechatLoginController extends BaseController { UseriFormallToken token = new UseriFormallToken(userInfo.getUsername()); subject.login(token); MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); - info.setPassword("保密"); - info.setBopenId("保密"); - if(StringUtils.isNotBlank(info.getWebOpenId())) { - info.setWebOpenId("保密"); - } + info.protectInfos(); String menus = mallUserRoleService.getPermissionsByUser(info); if(menus != null) { info.setMenus(menus); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index d48cf6bb5..503635402 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -261,6 +261,12 @@ public class MallUserInfo implements Serializable { this.webOpenId = webOpenId; } + public void protectInfos() { + setPassword(null); + setBopenId(null); + setWebOpenId(null); + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") From 2f47f33f5cb2430536dac5b65a8324510785e044 Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 27 Apr 2019 12:46:49 +0800 Subject: [PATCH 09/17] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxShopServiceImpl.java | 1 + .../src/main/resources/mapper/WxBillAllMapper.xml | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 36bdd1e77..6e80f05eb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -168,6 +168,7 @@ public class WxShopServiceImpl implements WxShopService { @Override public void exportNotRentShop(WxShop wxShop, HttpServletRequest request, HttpServletResponse response) { + wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); List> shops = wxShopMapper.notRentListMapAsPage(wxShop); List notRentShopVoList = new ArrayList<>(); for (Map m:shops) { diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 36852a571..de2568bd7 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -503,36 +503,36 @@ select id,merchant_id,shop_id,tenant_id,'租金' name,1 bill_type_value,'租金' bill_type,need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' - endtime,rent_shop_type from wx_bill_rent where is_preview = 0 and tenant_id = #{tenantId} + endtime,rent_shop_type from wx_bill_rent where is_preview = 0 and status = 1 and tenant_id = #{tenantId} union select id,merchant_id,shop_id,tenant_id,'物业费' name,3 bill_type_value,'物业费' bill_type,need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' - endtime,rent_shop_type from wx_bill_property where is_preview = 0 and tenant_id = #{tenantId} + endtime,rent_shop_type from wx_bill_property where is_preview = 0 and status = 1 and tenant_id = #{tenantId} union select res.id,res.merchant_id,res.shop_id,res.tenant_id,res.name,res.bill_type_value,res.bill_type,res.need_pay, res.receive_pay,res.pay,res.owe owe,res.receive_date,res.pay_date,res.expired_day,res.status,res.starttime,res.endtime,res.rent_shop_type from( select id,merchant_id,shop_id,tenant_id,'欠缴押金' name,2 bill_type_value,'欠缴押金' bill_type,need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' - endtime,rent_shop_type from wx_bill_rent_deposit where tenant_id = #{tenantId} + endtime,rent_shop_type from wx_bill_rent_deposit where status = 1 and tenant_id = #{tenantId} union select id,merchant_id,shop_id,tenant_id,'欠缴押金' name,4 bill_type_value,'欠缴押金' bill_type,need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' - endtime,rent_shop_type from wx_bill_property_deposit where tenant_id = #{tenantId} + endtime,rent_shop_type from wx_bill_property_deposit where status = 1 and tenant_id = #{tenantId} union select id,merchant_id,shop_id,tenant_id,'欠缴押金' name,8 bill_type_value,'欠缴押金' bill_type,0 as need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type - from wx_bill_other_deposit where tenant_id = #{tenantId} + from wx_bill_other_deposit where status = 1 and tenant_id = #{tenantId} ) res union select res.id,res.merchant_id,res.shop_id,res.tenant_id,res.name,res.bill_type_value,res.bill_type,res.need_pay, res.receive_pay,res.pay,res.owe owe,res.receive_date,res.pay_date,res.expired_day,res.status,res.starttime,res.endtime,res.rent_shop_type from( select id,merchant_id,shop_id,tenant_id,'其他费用' name,5 bill_type_value,'其他费用' bill_type,0 as need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type - from wx_bill_daily where type in(1,2) and tenant_id = #{tenantId} + from wx_bill_daily where type in(1,2) and status = 1 and tenant_id = #{tenantId} union select id,merchant_id,shop_id,tenant_id,'其他费用' name,7 bill_type_value,'其他费用' bill_type,0 as need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type - from wx_bill_other where tenant_id = #{tenantId} + from wx_bill_other where status = 1 and tenant_id = #{tenantId} ) res ) bill From 8b31fc4a854f4f0bf9b509ae083de7f2c29fa19a Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 27 Apr 2019 16:27:52 +0800 Subject: [PATCH 10/17] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/vo/WxBillAll.java | 9 ++++ .../com/iformall/enums/EnumBillTypeStr.java | 43 +++++++++++++++++++ .../service/impl/WxChartServiceImpl.java | 41 +++++++++++++----- .../resources/mapper/WxBillDepositMapper.xml | 8 ++-- .../resources/mapper/WxBillOtherMapper.xml | 10 ++++- .../resources/mapper/WxBillPropertyMapper.xml | 2 +- .../resources/mapper/WxBillRentMapper.xml | 2 +- 7 files changed, 97 insertions(+), 18 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumBillTypeStr.java diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index e0d57bc93..fde116d79 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -65,6 +65,15 @@ public class WxBillAll { @io.swagger.annotations.ApiModelProperty(value = "欠缴总额", name = "totalOwe") private Integer totalOwe; + private List billTypeList; + + public List getBillTypeList() { + return billTypeList; + } + + public void setBillTypeList(List billTypeList) { + this.billTypeList = billTypeList; + } public Integer getRentOwe() { return rentOwe; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillTypeStr.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillTypeStr.java new file mode 100644 index 000000000..9ab2c0a78 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillTypeStr.java @@ -0,0 +1,43 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumBillTypeStr { + + RENT("租金", "租金"), + RENT_D("租赁押金", "租赁押金"), + PROPERTY("物业费","物业费"), + PROPERTY_D("物业押金", "物业押金"), + W("水费", "水费"), + D("电费", "电费"), + K("空调费", "空调费"), + O("其他", "其他"), + O_D("其他押金", "其他押金"), + ; + + public static EnumBillTypeStr getEnum(String code) { + for (EnumBillTypeStr value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private String code; + private String message; + + EnumBillTypeStr(String String, String message) { + this.code = code; + this.message = message; + } + + public String getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 22d31b5c8..c470a1f46 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -71,6 +71,8 @@ public class WxChartServiceImpl implements WxChartDataService { @Autowired WxBillOtherMapper wxBillOtherMapper; @Autowired + WxBillAllMapper wxBillAllMapper; + @Autowired MarkingDataReportService markingDataReportService; @Override @@ -2397,9 +2399,15 @@ public class WxChartServiceImpl implements WxChartDataService { datamap.put("otherzjsjl", 0); } - //欠缴数据 + //==========欠缴数据========= BigDecimal totalOwe = new BigDecimal(0); - payinfo = wxBillRentMapper.queryOweInfo(params); + WxBillAll wxBillAll = new WxBillAll(); + wxBillAll.setTenantId(tenantId); + wxBillAll.setMonth(new SimpleDateFormat("yyyy-MM").format(startDate)); + List billTypeList = new ArrayList<>(); + billTypeList.add(EnumBillTypeStr.RENT.getCode()); + wxBillAll.setBillTypeList(billTypeList); + payinfo = wxBillAllMapper.queryOweInfo(wxBillAll); if (payinfo != null) { BigDecimal owe = (BigDecimal) payinfo.get("owe"); totalOwe = totalOwe.add(owe); @@ -2408,7 +2416,10 @@ public class WxChartServiceImpl implements WxChartDataService { datamap.put("rentOwe", 0); } - payinfo = wxBillPropertyMapper.queryOweInfo(params); + billTypeList = new ArrayList<>(); + billTypeList.add(EnumBillTypeStr.PROPERTY.getCode()); + wxBillAll.setBillTypeList(billTypeList); + payinfo = wxBillAllMapper.queryOweInfo(wxBillAll); if (payinfo != null) { BigDecimal owe = (BigDecimal) payinfo.get("owe"); totalOwe = totalOwe.add(owe); @@ -2417,25 +2428,35 @@ public class WxChartServiceImpl implements WxChartDataService { datamap.put("propertyOwe", 0); } - payinfo = wxBillOtherMapper.queryOweInfo(params); + billTypeList = new ArrayList<>(); + billTypeList.add(EnumBillTypeStr.O_D.getCode()); + billTypeList.add(EnumBillTypeStr.PROPERTY_D.getCode()); + billTypeList.add(EnumBillTypeStr.RENT_D.getCode()); + wxBillAll.setBillTypeList(billTypeList); + payinfo = wxBillAllMapper.queryOweInfo(wxBillAll); if (payinfo != null) { BigDecimal owe = (BigDecimal) payinfo.get("owe"); totalOwe = totalOwe.add(owe); - datamap.put("otherOwe", owe); + datamap.put("depositOwe", owe); } else { - datamap.put("otherOwe", 0); + datamap.put("depositOwe", 0); } - payinfo = wxBillDepositMapper.queryOweInfoAll(params); + billTypeList = new ArrayList<>(); + billTypeList.add(EnumBillTypeStr.D.getCode()); + billTypeList.add(EnumBillTypeStr.W.getCode()); + billTypeList.add(EnumBillTypeStr.K.getCode()); + billTypeList.add(EnumBillTypeStr.O.getCode()); + payinfo = wxBillAllMapper.queryOweInfo(wxBillAll); if (payinfo != null) { BigDecimal owe = (BigDecimal) payinfo.get("owe"); totalOwe = totalOwe.add(owe); - datamap.put("totalOwe", owe); + datamap.put("otherOwe", owe); } else { - datamap.put("totalOwe", 0); + datamap.put("otherOwe", 0); } - datamap.put("totalOwe", totalOwe); + datamap.put("totalOwe", totalOwe); return new ResultData(datamap); } diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index 74e79294e..25cc0a36b 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -98,7 +98,7 @@ diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index 10acfc640..53468e9cb 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -111,8 +111,14 @@ diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index ea8656d46..9b054e522 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -122,7 +122,7 @@ diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 97cc826bb..59a530d18 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -125,7 +125,7 @@ From 40ab556ab30aee8ef19b8aa41bb93146162f8275 Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 27 Apr 2019 16:33:17 +0800 Subject: [PATCH 11/17] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxBillDepositMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index 25cc0a36b..ab05f23ba 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -98,7 +98,7 @@