Przeglądaj źródła

[C端][修改]:商户列表接口调整

release_toaliyun_real
hupeng 7 lat temu
rodzic
commit
86191d9ea7
3 zmienionych plików z 8 dodań i 12 usunięć
  1. +0
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
  2. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201905161621__ADD_MERCHANT_INTRODUCTION.sql
  3. +6
    -8
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 0
- 4
mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java Wyświetl plik

@@ -34,10 +34,6 @@ public class WxMerchantTradeDailyController extends BaseController {


@Autowired @Autowired
private WxMerchantTradeDailyService wxMerchantTradeDailyService; private WxMerchantTradeDailyService wxMerchantTradeDailyService;
@Autowired
private WxMerchantBUserService wxMerchantBUserService;
@Autowired
private WxMerchantService wxMerchantService;


@ApiOperation("获得指定日期的解单,默认不传reportDate为当天") @ApiOperation("获得指定日期的解单,默认不传reportDate为当天")
@GetMapping("/getVolume") @GetMapping("/getVolume")


+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V201905161621__ADD_MERCHANT_INTRODUCTION.sql Wyświetl plik

@@ -0,0 +1,2 @@
ALTER TABLE `wx_merchant`
ADD COLUMN `introduction` TEXT NULL DEFAULT NULL AFTER `qr_code`;

+ 6
- 8
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml Wyświetl plik

@@ -24,13 +24,13 @@
<result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/> <result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/>
<result column="is_admin" jdbcType="INTEGER" property="isAdmin"/> <result column="is_admin" jdbcType="INTEGER" property="isAdmin"/>
<result column="bill_setting" jdbcType="INTEGER" property="billSetting"/> <result column="bill_setting" jdbcType="INTEGER" property="billSetting"/>
<result column="qr_code" property="qrCode"/>
<result column="qr_code" jdbcType="VARCHAR" property="qrCode"/>
<result column="introduction" jdbcType="VARCHAR" property="introduction"/>
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, `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`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -120,16 +120,15 @@
</select> </select>


<sql id="allMerchantVoColumns"> <sql id="allMerchantVoColumns">
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
</sql> </sql>
<select id="getMerchantByCode" parameterType="java.util.Map" resultMap="MerchantVoResultMap"> <select id="getMerchantByCode" parameterType="java.util.Map" resultMap="MerchantVoResultMap">
select select
<include refid="allMerchantVoColumns"/> <include refid="allMerchantVoColumns"/>
FROM wx_merchant m FROM wx_merchant m
left join wx_brand b on b.id = m.brand
left join wx_business bu on bu.id = m.business_id left join wx_business bu on bu.id = m.business_id
<where> <where>
<if test=" null != tenantId "> <if test=" null != tenantId ">
@@ -176,7 +175,6 @@
select select
<include refid="allMerchantVoColumns"/> <include refid="allMerchantVoColumns"/>
FROM wx_merchant m FROM wx_merchant m
left join wx_brand b on b.id = m.brand
left join wx_business bu on bu.id = m.business_id left join wx_business bu on bu.id = m.business_id
where 1=1 where 1=1
<if test=" null != merchantName and ''!=merchantName "> <if test=" null != merchantName and ''!=merchantName ">


Ładowanie…
Anuluj
Zapisz