From 95df820da13934ae8db594cccfcce43f321c6e7f Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 12 Oct 2020 16:18:40 +0800 Subject: [PATCH 1/4] order_id --- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 0a21b7505..4ad8e0596 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -748,7 +748,7 @@ cu.phone,m2.name as verify_merchant_name,cal.channel_type --> - co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status, + co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.order_id, 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,c.source_type,ms.subsidy subsidy_num, (CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name, @@ -773,14 +773,14 @@ FROM wx_coupon_merchant wcm WHERE STATUS = 0 - and wcm.`tenant_id` = #{tenantId} + and wcm.`tenant_id` = #{tenantId}findListOfAdmin and wcm.`parent_tenant_id` = #{parentTenantId} 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, + SELECT co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.coupon_type, 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 @@ -849,6 +849,9 @@ and co.id = #{id} + + and co.order_id = #{orderId} + and c.id = #{couponId} From a804ba64d0bb9bf93311d478b75dd595a5feadb5 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 12 Oct 2020 16:33:28 +0800 Subject: [PATCH 2/4] show_time --- .../java/com/iformall/controller/WxCouponChannelController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 4d3fe2624..9c630d296 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -117,6 +117,7 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); + wxCouponChannel.setShowBeginTime(new Date()); return wxCouponChannelService.change(wxCouponChannel); } From 9035bc0884429a3c1da7fdc0d049ace15a32fe8d Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 12 Oct 2020 17:20:46 +0800 Subject: [PATCH 3/4] show_time --- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 4ad8e0596..018fb695b 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -773,7 +773,7 @@ FROM wx_coupon_merchant wcm WHERE STATUS = 0 - and wcm.`tenant_id` = #{tenantId}findListOfAdmin + and wcm.`tenant_id` = #{tenantId} and wcm.`parent_tenant_id` = #{parentTenantId} From 126d6e9f0ff2e5f041929677b1bd08f9289286e2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 12 Oct 2020 17:39:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=A5=BC?= =?UTF-8?q?=E5=B1=82bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxProjectConfigServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java index 168c3d4a4..7a873b924 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java @@ -159,15 +159,15 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { @Override @Transactional public void initBuilding(List wxMallBuildings) { + wxMallBuildingService.deleteByTenantId(wxMallBuildings.get(0).getTenantId()); + wxMallFloorService.deleteByTenantId(wxMallBuildings.get(0).getTenantId()); for (WxMallBuilding wxMallBuilding:wxMallBuildings) { - wxMallBuildingService.deleteByTenantId(wxMallBuilding.getTenantId()); wxMallBuilding.setId(null); wxMallBuilding.setMallId(Long.parseLong(wxMallBuilding.getTenantId())); if(wxMallBuilding.getFloors() != null && wxMallBuilding.getFloors().size() > 0){ wxMallBuilding.setFloorNumber(wxMallBuilding.getFloors().size()); wxMallBuildingService.saveOrUpdate(wxMallBuilding); for (WxMallFloor wxMallFloor:wxMallBuilding.getFloors()) { - wxMallFloorService.deleteByTenantId(wxMallBuilding.getTenantId()); wxMallFloor.setId(null); wxMallFloor.setTenantId(wxMallBuilding.getTenantId()); wxMallFloor.setParentTenantId(wxMallBuilding.getParentTenantId());