From becca9cc515fed0a2d9850eed826b177e0ed6653 Mon Sep 17 00:00:00 2001 From: furunxin <864795252@qq.com> Date: Tue, 14 Jul 2020 22:08:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BB=AD=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxRentContractExtensionController.java | 75 ++++++++++++++++++ .../src/main/resources/application-dev.yml | 77 +++++++++++++------ .../iformall/domain/po/WxRentContract.java | 2 +- .../iformall/mapper/WxRentContractMapper.java | 5 ++ .../service/WxRentContractService.java | 5 ++ .../impl/WxRentContractServiceImpl.java | 15 ++++ .../resources/mapper/WxBillRentMapper.xml | 1 + .../resources/mapper/WxRentContractMapper.xml | 12 +++ 8 files changed, 169 insertions(+), 23 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java new file mode 100644 index 000000000..9008e4e2d --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractExtensionController.java @@ -0,0 +1,75 @@ +package com.iformall.controller.contract; + +import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.WxRentContract; +import com.iformall.domain.po.WxShop; +import com.iformall.service.WxRentContractService; +import com.iformall.service.WxShopService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author: furunxin + * @Date: 2020/7/14 11:21 + * @Description: + */ +@RestController +@RequestMapping("wxRentContractExtension") +public class WxRentContractExtensionController extends BaseController { + + + @Autowired + private WxRentContractService wxRentContractService; + + @Autowired + private WxShopService wxShopService; + + @GetMapping("searchMerchant") + @ApiImplicitParams({ + @ApiImplicitParam(name = "merchantName", value = "商户名称", dataType = "string", paramType = "query", required = true)}) + @SystemControllerLog(description = "商户搜索") + public ResultData searchMerchant(String merchantName) throws Exception{ + WxRentContract wxRentContract = new WxRentContract(); + wxRentContract.setTenantId("789"); + wxRentContract.setMerchantName(merchantName); + List> result = wxRentContractService.searchMerchantByname(wxRentContract); + return new ResultData(result); + } + + + @GetMapping("getContractInfo") + @ApiImplicitParams({ + @ApiImplicitParam(name = "merchantId", value = "商户id", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "根据商户id查询该商户计租中合同信息") + public ResultData getContractInfo(Long merchantId) throws Exception{ + Map resultMap = new HashMap<>(); + WxRentContract wxRentContract = new WxRentContract(); + wxRentContract.setMerchantId(merchantId); + wxRentContract = wxRentContractService.getByMerchantId(wxRentContract); + WxShop wxShop = wxShopService.getById(wxRentContract.getShopId()); + resultMap.put("wxRentContract",wxRentContract); + resultMap.put("wxShop",wxShop); + return new ResultData(resultMap); + } + + @GetMapping("getAllContractInfo") + @ApiImplicitParams({ + @ApiImplicitParam(name = "merchantId", value = "商户id", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "根据商户id查询该商户下所有合同") + public ResultData getAllContractInfo(Long merchantId) throws Exception{ + WxRentContract wxRentContract = new WxRentContract(); + wxRentContract.setMerchantId(merchantId); + List rentContracts = wxRentContractService.getAllContractByMerchantId(wxRentContract); + return new ResultData(rentContracts); + } +} diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index c6efcbfa4..5b02ef220 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -1,13 +1,12 @@ spring: profiles: - include: aliyunRocketMQ - #include: rabbitMQ + #include: aliyunRocketMQ + include: rabbitMQ # JDBC datasource: - #url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true - url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true - username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) - password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4) + url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true + username: root + password: fm2020test type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -24,13 +23,13 @@ spring: poolPreparedStatements: true maxOpenPreparedStatements: 20 connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=60000" - #jackson: + #jackson: #date-format: yyyy-MM-dd HH:mm:ss # REDIS redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 5 @@ -42,7 +41,7 @@ spring: max-wait: -1 min-idle: 10 - # SMS + aliyun: sms: accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V @@ -53,6 +52,14 @@ spring: dateFormat: yyyyMMdd endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com + # EMAIL mail: host: smtp.exmail.qq.com @@ -67,6 +74,7 @@ spring: socketFactory: port: 465 class: javax.net.ssl.SSLSocketFactory + # ROCKETMQ rocketmq: nameServer: 127.0.0.1:9876 @@ -81,8 +89,8 @@ spring: rabbitmq: host: 202.165.179.86 port: 5672 - username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) - password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) + username: fumao + password: f9l98&*%%u7flt33 publisher-confirms: true publisher-returns: false virtual-host: / @@ -100,20 +108,45 @@ aws: access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=) secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=) +#wechat: +# web: +# appId: "wxe31beafbfd8295ba" +# secret: "c689fabf3c4c9f5b6424ff2a36a26727" +# url: "https://mall.youlane.cn" +# open: +# componentAppId: "wx897e4673286c915d" +# componentSecret: "cdfdfda65c45689beb6766c4c427eed2" +# componentToken: "formall2018" +# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" +# redis: +# host: 202.165.179.86 +# port: 6379 +# password: iF0rm@2l2ol9 +# timeout: 3600 +# expire: 1800 #30分钟 +# database: 2 +# defaultExpiration: 2592000 # 默认生命周期30天 +# jedis: +# pool: +# max-active: 100 +# max-idle: 500 +# max-wait: -1 +# min-idle: 10 + wechat: web: - appId: "wxe31beafbfd8295ba" - secret: "c689fabf3c4c9f5b6424ff2a36a26727" - url: "https://mall.youlane.cn" + appId: "wx091907dd0bfd3f6b" + secret: "2a2ca10738998b9ef92c1fe8a4d366a6" + url: "https://admintest.malls.iformall.com" open: - componentAppId: "wx897e4673286c915d" - componentSecret: "cdfdfda65c45689beb6766c4c427eed2" - componentToken: "formall2018" - componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" + componentAppId: wxdfc8fb4e62d6b52b + componentSecret: 98daa62b316dd6feabaad708327ce233 + componentToken: formall2018 + componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -121,7 +154,7 @@ wechat: jedis: pool: max-active: 100 - max-idle: 500 + max-idle: 100 max-wait: -1 min-idle: 10 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index df357e980..20f4cca6e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -94,7 +94,7 @@ public class WxRentContract extends TenantEntity { private Integer receivePeriod; @io.swagger.annotations.ApiModelProperty(value = "合同文件路径", name = "filepath") private String filepath; - @io.swagger.annotations.ApiModelProperty(value = "合同进度状态1待签约2已签约未记租3计租中4提前终止5合同到期", name = "status") + @io.swagger.annotations.ApiModelProperty(value = "合同进度状态1待签约2已签约未记租3计租中4提前终止5合同到期", name = "status") private Integer status; @io.swagger.annotations.ApiModelProperty(value = "合同编号", name = "contractNumber") private String contractNumber; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index a08a423e1..7758a8736 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -78,4 +78,9 @@ public interface WxRentContractMapper extends CommonMapper List> queryContractByBus(WxBusiness wxBusiness); + List> searchMerchantByname(WxRentContract wxRentContract); + + WxRentContract getByMerchantId(WxRentContract wxRentContract); + + List getAllContractBymerchantId(WxRentContract wxRentContract); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index c3f791d8f..865a0c730 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -101,4 +101,9 @@ public interface WxRentContractService { ResultData getContractByContractNumber(WxRentContract wxRentContract); + List> searchMerchantByname(WxRentContract wxRentContract); + + WxRentContract getByMerchantId(WxRentContract wxRentContract); + + List getAllContractByMerchantId(WxRentContract wxRentContract); } 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 a1d7b4abd..f09159061 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2540,4 +2540,19 @@ public class WxRentContractServiceImpl implements WxRentContractService { WxRentContract wxRentContract = wxRentContractMapper.selectOne(new QueryWrapper<>(rentContract)); return new ResultData(wxRentContract); } + + @Override + public List> searchMerchantByname(WxRentContract wxRentContract) { + return wxRentContractMapper.searchMerchantByname(wxRentContract); + } + + @Override + public WxRentContract getByMerchantId(WxRentContract wxRentContract) { + return wxRentContractMapper.getByMerchantId(wxRentContract); + } + + @Override + public List getAllContractByMerchantId(WxRentContract wxRentContract) { + return wxRentContractMapper.getAllContractBymerchantId(wxRentContract); + } } diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index a0f6b5d44..c070c9dc4 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -326,5 +326,6 @@ update wx_bill_rent set owe = receive_pay + service_charge_pay + ifnull(late_pay_price,0) - pay where status in (1,2,4) + diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 40641b337..a5c69a63f 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -519,5 +519,17 @@ `rent_shop_type` = 2 AND `shop_id` = #{shopId} ) + + + + + +