Просмотр исходного кода

[打折商户信息][信息]:c端展示打折商户信息

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
1800653cc7
5 измененных файлов: 66 добавлений и 31 удалений
  1. +36
    -27
      mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java
  3. +8
    -0
      mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
  4. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  5. +15
    -4
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 36
- 27
mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java Просмотреть файл

@@ -4,14 +4,9 @@ import com.iformall.annotation.AuthIgnore;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxAppinfo;
import com.iformall.domain.po.WxLevelConfig;
import com.iformall.domain.po.WxMall;
import com.iformall.domain.po.WxScoreRules;
import com.iformall.service.WxAppinfoService;
import com.iformall.service.WxLevelConfigService;
import com.iformall.service.WxMallService;
import com.iformall.service.WxScoreRulesService;
import com.iformall.domain.po.*;
import com.iformall.enums.EnumMerchantStatus;
import com.iformall.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
@@ -48,9 +43,12 @@ public class WxMallController extends BaseController {
@Autowired
private WxLevelConfigService wxLevelConfigService;

@Autowired
private WxMerchantService wxMerchantService;


@AuthIgnore
@ApiOperation("根据appId获取")
@ApiOperation("商场图标")
@GetMapping("/getAppIcon")
@ApiImplicitParam(name = "appId", value = "appId", dataType = "String", paramType = "query", required = true)
public ResultData getAppIcon(String appId) {
@@ -69,7 +67,7 @@ public class WxMallController extends BaseController {
}

@AuthIgnore
@ApiOperation("根据appId获取")
@ApiOperation("商场提示信息")
@GetMapping("/getWeapNote")
@ApiImplicitParam(name = "appId", value = "appId", dataType = "String", paramType = "query", required = true)
public ResultData getWeapNote(String appId) {
@@ -86,37 +84,48 @@ public class WxMallController extends BaseController {
return new ResultData(Result.SUCCESS, "查询成功", resultMap);
}

@ApiOperation("根据appId获取")
@ApiOperation("商场信息")
@GetMapping("/mallInfo")
@ApiImplicitParam(name = "appId", value = "appId", dataType = "String", paramType = "query", required = true)
public ResultData getMallInfo(String appId) {
WxAppinfo appInfo = wxAppinfoService.getByAppId(appId);
if (appInfo == null) {
return new ResultData(ErrorCode.APP_ID_NOT_FOUND);
}
WxMall mall = wxMallService.getByTenantId(appInfo.getTenantId());
public ResultData getMallInfo() {
WxCUser user = getUser();
WxMall mall = wxMallService.getByTenantId(user.getTenantId());
if (mall == null) {
return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND);
}
return new ResultData(Result.SUCCESS, "查询成功", mall);
}

@ApiOperation("根据appId获取")
@ApiOperation("成长值相关信息")
@GetMapping("/scoreLevelInfo")
@ApiImplicitParam(name = "appId", value = "appId", dataType = "String", paramType = "query", required = true)
public ResultData getScoreLevelInfo(String appId) {
WxAppinfo appInfo = wxAppinfoService.getByAppId(appId);
if (appInfo == null) {
return new ResultData(ErrorCode.APP_ID_NOT_FOUND);
}
public ResultData getScoreLevelInfo() {
WxCUser user = getUser();
Map map = new HashMap();
WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(appInfo.getTenantId());
WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(user.getTenantId());
map.put("score", scoreRules);
List<WxLevelConfig> levelConfigList = wxLevelConfigService.getByTenantId(appInfo.getTenantId());
List<WxLevelConfig> levelConfigList = wxLevelConfigService.getByTenantId(user.getTenantId());
boolean disscountEnable = false;
for(WxLevelConfig levelConfig: levelConfigList) {
if (levelConfig.getDiscountEnable() > 0 ) {
disscountEnable = true;
break;
}
}
map.put("levelList", levelConfigList);
map.put("discountEnable", disscountEnable);
return new ResultData(Result.SUCCESS, "查询成功", map);
}

@ApiOperation("获取打折商户列表")
@GetMapping("/discountMerchantList")
public ResultData getMerchantId() {
WxCUser user = getUser();
WxMerchant merchantQ = new WxMerchant();
merchantQ.setTenantId(user.getTenantId());
merchantQ.setStatus(EnumMerchantStatus.VALID.getCode());
List<WxMerchant> list = wxMerchantService.getDisCountList(merchantQ);
return new ResultData(Result.SUCCESS, "查询成功", list);
}

@AuthIgnore
@ApiOperation("获取后端版本号")
@GetMapping("/version")


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java Просмотреть файл

@@ -7,6 +7,8 @@ import com.iformall.domain.po.WxMerchant;
public interface WxMerchantMapper extends CommonMapper<WxMerchant, Long> {

List<WxMerchant> findList(WxMerchant wxMerchant);

List<WxMerchant> findDiscountList(WxMerchant wxMerchant);



+ 8
- 0
mallinkService/src/main/java/com/iformall/service/WxMerchantService.java Просмотреть файл

@@ -21,6 +21,14 @@ public interface WxMerchantService {
*/
PageInfo<WxMerchant> listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize);

/**
* 根据实体查询分页列表
*
* @param record
* @return
*/
List<WxMerchant> getDisCountList(WxMerchant record);

/**
* 根据实体查询分页列表
*


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Просмотреть файл

@@ -100,6 +100,11 @@ public class WxMerchantServiceImpl implements WxMerchantService {
return pageInfo;
}

@Override
public List<WxMerchant> getDisCountList(WxMerchant record) {
return wxMerchantMapper.findDiscountList(record);
}

@Override
public List<WxMerchant> etcpList(WxMerchant record) {
record.setCarVendorType(EnumCarVendor.CAR_ETCP.getCode());


+ 15
- 4
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml Просмотреть файл

@@ -19,8 +19,6 @@
<result column="vip_discount_rate1" jdbcType="SMALLINT" property="vipDiscountRate1"/>
<result column="vip_discount_rate2" jdbcType="SMALLINT" property="vipDiscountRate2"/>
<result column="vip_discount_rate3" jdbcType="SMALLINT" property="vipDiscountRate3"/>


</resultMap>

<sql id="allColumns">
@@ -66,8 +64,6 @@
<if test=" null != carParams ">
and `car_params` like concat('%', #{carParams},'%')
</if>


<if test=" null != status ">
and `status` = #{status}
</if>
@@ -90,5 +86,20 @@
<include refid="dynamicWhereConditions"/>
</select>

<select id="findDiscountList" parameterType="com.iformall.domain.po.WxMerchant" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_merchant
<where>
<if test=" null != tenantId ">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != status ">
and `status` = #{status}
</if>
and ( `vip_discount_rate1` > 0 or `vip_discount_rate2` > 0 or `vip_discount_rate3` > 0)
</where>
</select>


</mapper>

Загрузка…
Отмена
Сохранить