From df0dc9c2301647e8ec10861417d90f0a4e67775a Mon Sep 17 00:00:00 2001 From: furunxin <864795252@qq.com> Date: Wed, 5 Aug 2020 22:01:06 +0800 Subject: [PATCH 1/4] =?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 --- .../WxRentContractv2Controller.java | 59 +++++++++++++++++++ .../iformall/controller/WxCarController.java | 4 +- .../com/iformall/mapper/WxMerchantMapper.java | 2 + .../iformall/service/WxMerchantService.java | 2 + .../service/impl/WxMerchantServiceImpl.java | 8 ++- 5 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/iformall/controller/contractv2/WxRentContractv2Controller.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contractv2/WxRentContractv2Controller.java b/mallinkAdmin/src/main/java/com/iformall/controller/contractv2/WxRentContractv2Controller.java new file mode 100644 index 000000000..ec491e566 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contractv2/WxRentContractv2Controller.java @@ -0,0 +1,59 @@ +package com.iformall.controller.contractv2; + +import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.WxRentContract; +import com.iformall.enums.EnumContractType; +import com.iformall.service.WxMerchantService; +import com.iformall.service.WxRentPropertyContractService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author: furunxin + * @Date: 2020/8/5 10:13 + * @Description: + */ + +@Slf4j +@RestController +@RequestMapping("wxRentContract_V2") +@Api(description = "租赁合同V2版本") +public class WxRentContractv2Controller extends BaseController { + + @Autowired + private WxMerchantService wxMerchantService; + + + @Autowired + private WxRentPropertyContractService wxRentPropertyContractService; + + @GetMapping("getMerchantList") + @SystemControllerLog(description = "获取商户列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "shopType", value = "店铺类型 1:店铺 2:多经点位", dataType = "Integer", paramType = "query", required = true)}) + public ResultData getMerchantList(Integer shopType) throws Exception{ + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.updateTenantInfo(getTenantInfo()); + wxMerchant.setRentShopType(shopType); + return new ResultData(Result.SUCCESS, "查询成功", wxMerchantService.getMerchantList(wxMerchant)); + } + + + @PostMapping("add") + @SystemControllerLog(description = "租赁合同-添加") + public ResultData add(@RequestBody WxRentContract wxRentContract) { + log.debug("[" + getIpAddr() + "] WxRentContractv2Controller::add"); + //查询合同类型 + Integer contractType = wxRentPropertyContractService.getContractType(wxRentContract.getRentShopType(), wxRentContract.getOperationType(), EnumContractType.RENT.getCode()); + wxRentContract.setContractType(contractType); + return null; + } +} diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 69ced7cb0..ac3c2bb36 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -75,7 +75,9 @@ public class WxCarController extends BaseController { private WxPark getCurrentPark(TenantEntity tenantEntity) { WxPark parkQ = new WxPark(); - parkQ.updateTenantInfo(tenantEntity); + //parkQ.updateTenantInfo(tenantEntity); + parkQ.setTenantId("789"); + parkQ.setParentTenantId("788"); WxPark wxPark = wxParkService.getByObj(parkQ); // 1, get mall's park // future use redis to optimize diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 9abd85f68..b93f079e1 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -36,4 +36,6 @@ public interface WxMerchantMapper extends CommonMapper { WxMerchant findByTrade(HashMap params); List findListVo2(WxMerchant record); + + List getMerchantList(WxMerchant wxMerchant); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index e412c227f..a26410c9b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -147,4 +147,6 @@ public interface WxMerchantService { PageInfo listVoAsPage2(WxMerchant wxMerchant, Integer pageNum, Integer pageSize); + List getMerchantList(WxMerchant wxMerchant); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 75c55b3df..f39136a4c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -721,8 +721,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); List merchantList = wxMerchantMapper.selectList(new QueryWrapper(wxMerchant)); - if (merchantList.size() == 1) + if (merchantList.size() == 1){ return Optional.of(merchantList.get(0)); + } return Optional.empty(); } @@ -803,4 +804,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { PageInfo pageInfo = new PageInfo<>(merchants); return pageInfo; } + + @Override + public List getMerchantList(WxMerchant wxMerchant) { + return wxMerchantMapper.getMerchantList(wxMerchant); + } } From ee3b45b076186baf140f7ac80cbe2a592b34d092 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 6 Aug 2020 11:19:49 +0800 Subject: [PATCH 2/4] fix bug --- .../com/iformall/domain/po/WxCouponOrder.java | 2 +- .../resources/mapper/WxCouponOrderMapper.xml | 37 +++++++++++++------ 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java index 3b860857e..70118f9b9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java @@ -42,7 +42,7 @@ public class WxCouponOrder extends TenantEntity { private Date updateDate; @io.swagger.annotations.ApiModelProperty(value = "单券实际购买价格", name = "couponPrice") private Integer couponPrice; - @io.swagger.annotations.ApiModelProperty(value = "支付渠道EnumPayWay", name = "pay_vendor") + @io.swagger.annotations.ApiModelProperty(value = "支付渠道EnumPayWay", name = "payVendor") private Integer payVendor; @io.swagger.annotations.ApiModelProperty(value="过期退款(0:正常,1不退)",name="autoRefund") private Integer autoRefund; diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 07b55f52e..136521dcb 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -18,10 +18,11 @@ + - `id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_type`,`c_user_id`,`owner_id`,`b_user_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`, `auto_refund`, `verify_type` + `id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_type`,`c_user_id`,`owner_id`,`b_user_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`, `auto_refund`, `verify_type`,`pay_vendor` @@ -85,6 +86,10 @@ and `auto_refund` = #{autoRefund} + + + and `pay_vendor` = #{payVendor} + and id in @@ -657,7 +662,9 @@ - + + + @@ -699,6 +706,8 @@ + + @@ -739,7 +748,7 @@ --> co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status, - co.create_date,co.update_date,co.coupon_price, c.title,c.sale_price,c.use_price,c.price, + co.create_date,co.update_date,co.coupon_price, co.verify_type, co.pay_vendor,c.title,c.sale_price,c.use_price,c.price, c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num, (CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name, (CASE WHEN couc.mc = 1 THEN m1.id ELSE 0 END) AS merchant_id, @@ -748,7 +757,7 @@ co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id, - co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, + co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type, co.pay_vendor, c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num, bu.name, bu.phone as bphone, cu.phone, @@ -771,7 +780,7 @@ GROUP BY product_id) couc RIGHT JOIN ( SELECT co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.coupon_type, - co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price + co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.auto_refund,co.verify_type,co.pay_vendor FROM wx_coupon_order co WHERE 1=1 and co.`tenant_id` = #{tenantId} @@ -884,14 +893,14 @@ - co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, + co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.pay_vendor, c.type,c.title,c.sale_price,c.use_price,c.price,c.unit, bu.name, cu.phone - co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, + co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.pay_vendor, c.type,c.title,c.sale_price,c.use_price,c.price,c.unit, cu.phone @@ -940,7 +949,7 @@ - co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price + co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.pay_vendor - co.id,co.coupon_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type, + co.id,co.coupon_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.pay_vendor, c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit, json_extract(car.vendor_params,'$.id') as coupon_free_id @@ -1213,6 +1225,7 @@ + From 21cea58300796c2e5ae750bdb29f94303026d4cf Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 6 Aug 2020 13:02:19 +0800 Subject: [PATCH 3/4] update --- .../com/iformall/service/impl/WxOrderServiceImpl.java | 8 ++++---- .../iformall/service/impl/WxRefundOrderServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index c7b92814a..72b532e91 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1393,10 +1393,10 @@ public class WxOrderServiceImpl implements WxOrderService { logger.error("券不存在, couponId: " + updateOrder.getProductId()); throw new MallinkException(ErrorCode.COUPON_IS_EMPTY); } - if (coupon.getStatus() == EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode()) { - logger.error("券已下架, couponId: " + updateOrder.getProductId()); - throw new MallinkException(ErrorCode.COUPON_IS_TAKE_OFF); - } +// if (coupon.getStatus() == EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode()) { +// logger.error("券已下架, couponId: " + updateOrder.getProductId()); +// throw new MallinkException(ErrorCode.COUPON_IS_TAKE_OFF); +// } // 检查用户 WxCUserBasicInfo basicUser = wxCUserBasicInfoMapper.selectById(updateOrder.getCUserId()); if (basicUser == null) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index ba869e12b..ec14ea0f8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -226,7 +226,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { try { wxOrderMapper.insert(rOrder); } catch (Exception e) { - logger.error("退款订单保存出错: " + e.getMessage()); + logger.error("退款订单保存出错: " + e.getMessage(),e); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "退款订单保存出错"); } From 0d1ad92f91a253be2df70b6c1edee0dd900ea440 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 6 Aug 2020 14:53:18 +0800 Subject: [PATCH 4/4] update --- mallinkBApi/src/main/java/com/iformall/BApplication.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mallinkBApi/src/main/java/com/iformall/BApplication.java b/mallinkBApi/src/main/java/com/iformall/BApplication.java index bf9acfdd7..fcb59ee45 100644 --- a/mallinkBApi/src/main/java/com/iformall/BApplication.java +++ b/mallinkBApi/src/main/java/com/iformall/BApplication.java @@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.EnableAspectJAutoProxy; /** * @author chenkx @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Bean; @MapperScan(basePackages = {"com.iformall.mapper"}) @EnableEncryptableProperties @EnableRocketMQ +@EnableAspectJAutoProxy(exposeProxy = true) public class BApplication { @Value("${fm.exception}")