From 86191d9ea7f8ebcbc38761090698f073cd394994 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 16 May 2019 16:33:41 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF][=E4=BF=AE=E6=94=B9]:=E5=95=86?= =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datatower/WxMerchantTradeDailyController.java | 4 ---- .../V201905161621__ADD_MERCHANT_INTRODUCTION.sql | 2 ++ .../src/main/resources/mapper/WxMerchantMapper.xml | 14 ++++++-------- 3 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905161621__ADD_MERCHANT_INTRODUCTION.sql diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index 4895549e0..bf95ef510 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -34,10 +34,6 @@ public class WxMerchantTradeDailyController extends BaseController { @Autowired private WxMerchantTradeDailyService wxMerchantTradeDailyService; - @Autowired - private WxMerchantBUserService wxMerchantBUserService; - @Autowired - private WxMerchantService wxMerchantService; @ApiOperation("获得指定日期的解单,默认不传reportDate为当天") @GetMapping("/getVolume") diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905161621__ADD_MERCHANT_INTRODUCTION.sql b/mallinkAdmin/src/main/resources/db/migration/V201905161621__ADD_MERCHANT_INTRODUCTION.sql new file mode 100644 index 000000000..b69701cbd --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905161621__ADD_MERCHANT_INTRODUCTION.sql @@ -0,0 +1,2 @@ +ALTER TABLE `wx_merchant` +ADD COLUMN `introduction` TEXT NULL DEFAULT NULL AFTER `qr_code`; diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index e6bc41615..690a4a18b 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -24,13 +24,13 @@ - - + + `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, - `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,qr_code + `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,`qr_code`,`introduction` @@ -120,16 +120,15 @@ - m.id,m.img_url,m.name,m.link_phone,m.status,m.business_id,m.sub_business_id, - m.is_public,m.email,m.title,m.cover_picture,b.name as brand_name,b.logo as brand_img, - m.shop_type,bu.title as business_name,b.summary + m.id,m.img_url,m.name,m.link_phone,m.status,m.business_id, + m.is_public,m.email,m.title,m.cover_picture,m.sub_business_id, + m.shop_type,m.introduction,bu.title as business_name