Skip to content

G
gic-platform-enterprise
Commit 983d54a8 by guojuxing
Options

微盟商城-店铺配置调整

parent 9da628ea
Showing with 86 additions and 76 deletions
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/wm/WmStoreConfigDTO.java
......@@ -24,9 +24,9 @@ public class WmStoreConfigDTO implements Serializable{
private Integer enterpriseId;
/**
* 微盟主账号(平台唯一)，用于关联配置
* 店铺主键ID，用于关联配置
*/
private String wmMainAccount;
private Integer wmMallStoreId;
/**
* 店铺配置类型 1:会员卡配置 2:卡券配置 3:订单配置 4:积分配置 5:商品同步记录 6:小程序配置
......@@ -71,12 +71,12 @@ public class WmStoreConfigDTO implements Serializable{
return this;
}
public String getWmMainAccount() {
return wmMainAccount;
public Integer getWmMallStoreId() {
return wmMallStoreId;
}
public WmStoreConfigDTO setWmMainAccount(String wmMainAccount) {
this.wmMainAccount = wmMainAccount;
public WmStoreConfigDTO setWmMallStoreId(Integer wmMallStoreId) {
this.wmMallStoreId = wmMallStoreId;
return this;
}
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/WmStoreApiService.java
......@@ -89,24 +89,24 @@ public interface WmStoreApiService {
/**
* 根据微盟主账号查询配置
* @Title: getWmStoreConfigByWmMainAccount

* @Title: getWmStoreConfig

* @Description:

* @author guojuxing
* @param wmMainAccount

* @param wmMallStoreId 店铺主键ID

* @param wmStoreConfigType 店铺配置类型 WmStoreConfigTypeEnum 枚举类
* @return com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.wm.WmStoreConfigDTO>


*/
ServiceResponse<WmStoreConfigDTO> getWmStoreConfigByWmMainAccount(String wmMainAccount, Integer wmStoreConfigType);
ServiceResponse<WmStoreConfigDTO> getWmStoreConfig(Integer wmMallStoreId, Integer wmStoreConfigType);
/**
* 查询店铺配置 key : 配置类型 WmStoreConfigTypeEnum 枚举类
* @Title: getWmStoreConfigByWmMainAccount

* @Title: getWmStoreConfigKey

* @Description:

* @author guojuxing
* @param wmMainAccount

* @param wmMallStoreId 店铺主键ID

* @return com.gic.api.base.commons.ServiceResponse<java.util.Set<String>>


*/
ServiceResponse<Set<String>> getWmStoreConfigByWmMainAccount(String wmMainAccount);
ServiceResponse<Set<String>> getWmStoreConfigKey(Integer wmMallStoreId);
/**
* 绑定卡券
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabWmStoreConfigMapper.java
......@@ -54,7 +54,7 @@ public interface TabWmStoreConfigMapper {
*/
int updateByPrimaryKey(TabWmStoreConfig record);
TabWmStoreConfig getByWmMainAccount(@Param("wmMainAccount") String wmMainAccount, @Param("storeConfigType") Integer storeConfigType);
TabWmStoreConfig getWmStoreConfig(@Param("wmMallStoreId") Integer wmMallStoreId, @Param("storeConfigType") Integer storeConfigType);
List<TabWmStoreConfig> listWmStoreConfigByWmMainAccount(String wmMainAccount);
List<TabWmStoreConfig> listWmStoreConfig(Integer wmMallStoreId);
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabWmStoreConfig.java
......@@ -17,9 +17,9 @@ public class TabWmStoreConfig {
private Integer enterpriseId;
/**
* 微盟主账号(平台唯一)，用于关联配置
* 店铺主键ID，用于关联配置
*/
private String wmMainAccount;
private Integer wmMallStoreId;
/**
* 店铺配置类型 1:会员卡配置 2:卡券配置 3:订单配置 4:积分配置 5:商品同步记录 6:小程序配置
......@@ -64,12 +64,12 @@ public class TabWmStoreConfig {
return this;
}
public String getWmMainAccount() {
return wmMainAccount;
public Integer getWmMallStoreId() {
return wmMallStoreId;
}
public TabWmStoreConfig setWmMainAccount(String wmMainAccount) {
this.wmMainAccount = wmMainAccount;
public TabWmStoreConfig setWmMallStoreId(Integer wmMallStoreId) {
this.wmMallStoreId = wmMallStoreId;
return this;
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/WmStoreConfigService.java
package com.gic.enterprise.service;
import java.util.List;
import com.gic.enterprise.dto.wm.WmStoreConfigDTO;
import com.gic.enterprise.entity.TabWmStoreConfig;
import java.util.List;
public interface WmStoreConfigService {
/**
......@@ -21,14 +21,14 @@ public interface WmStoreConfigService {
/**
* 根据微盟主账号查询配置
* @Title: getByWmMainAccount

* @Title: getWmStoreConfig

* @Description:

* @author guojuxing
* @param wmMainAccount
* @param wmMallStoreId 店铺主键ID
* @param storeConfigType
店铺配置类型 WmStoreConfigTypeEnum枚举类
* @return com.gic.enterprise.entity.TabWmStoreConfig


*/
TabWmStoreConfig getByWmMainAccount(String wmMainAccount, Integer storeConfigType);
TabWmStoreConfig getWmStoreConfig(Integer wmMallStoreId, Integer storeConfigType);
List<TabWmStoreConfig> listWmStoreConfigByWmMainAccount(String wmMainAccount);
List<TabWmStoreConfig> listWmStoreConfig(Integer wmMallStoreId);
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/WmStoreConfigServiceImpl.java
package com.gic.enterprise.service.impl;
import java.util.Date;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dao.mapper.TabWmStoreConfigMapper;
import com.gic.enterprise.dto.wm.WmStoreConfigDTO;
import com.gic.enterprise.entity.TabWmStoreConfig;
import com.gic.enterprise.service.WmStoreConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
@Service("wmStoreConfigService")
public class WmStoreConfigServiceImpl implements WmStoreConfigService{
......@@ -35,12 +36,13 @@ public class WmStoreConfigServiceImpl implements WmStoreConfigService{
}
@Override
public TabWmStoreConfig getByWmMainAccount(String wmMainAccount, Integer storeConfigType) {
return tabWmStoreConfigMapper.getByWmMainAccount(wmMainAccount, storeConfigType);
public TabWmStoreConfig getWmStoreConfig(Integer wmMallStoreId, Integer storeConfigType) {
return tabWmStoreConfigMapper.getWmStoreConfig(wmMallStoreId, storeConfigType);
}
@Override
public List<TabWmStoreConfig> listWmStoreConfigByWmMainAccount(String wmMainAccount) {
return tabWmStoreConfigMapper.listWmStoreConfigByWmMainAccount(wmMainAccount);
public List<TabWmStoreConfig> listWmStoreConfig(Integer wmMallStoreId) {
return tabWmStoreConfigMapper.listWmStoreConfig(wmMallStoreId);
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/WmStoreApiServiceImpl.java
package com.gic.enterprise.service.outer.impl;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page;
import com.gic.commons.util.PageHelperUtils;
import com.gic.commons.util.StringUtil;
import com.gic.enterprise.dto.WmOrderConfigDTO;
import com.gic.enterprise.dto.wm.WmCouponDTO;
import com.gic.enterprise.dto.wm.WmStoreCouponConfigDTO;
import com.gic.enterprise.entity.TabWmStoreCouponConfig;
import com.gic.enterprise.qo.wm.CouponConfigQO;
import com.gic.enterprise.service.WmStoreCouponConfigService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.commons.util.StringUtil;
import com.gic.enterprise.constant.MallModeEnum;
import com.gic.enterprise.constant.WmStoreConfigTypeEnum;
import com.gic.enterprise.dto.WmMemberCardConfigDTO;
import com.gic.enterprise.dto.WmOrderConfigDTO;
import com.gic.enterprise.dto.WmStoreDTO;
import com.gic.enterprise.dto.wm.WmCouponDTO;
import com.gic.enterprise.dto.wm.WmStoreConfigDTO;
import com.gic.enterprise.dto.wm.WmStoreCouponConfigDTO;
import com.gic.enterprise.entity.TabWmStore;
import com.gic.enterprise.entity.TabWmStoreConfig;
import com.gic.enterprise.entity.TabWmStoreCouponConfig;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.qo.wm.CouponConfigQO;
import com.gic.enterprise.service.WmStoreApiService;
import com.gic.enterprise.service.WmStoreConfigService;
import com.gic.enterprise.service.WmStoreCouponConfigService;
import com.gic.enterprise.service.WmStoreService;
@Service("wmStoreApiService")
......@@ -94,14 +97,14 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
if (!WmStoreConfigTypeEnum.isRightCode(dto.getStoreConfigType())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "店铺配置类型值非法");
}
TabWmStore wmStore = wmStoreService.getByWmMainAccount(dto.getWmMainAccount());
TabWmStore wmStore = wmStoreService.getByWmMallStoreId(dto.getWmMallStoreId());
if (wmStore == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "微盟主账号错误，查无数据");
}
if (StringUtils.isBlank(dto.getStoreConfigJson())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "店铺配置信息不能为空");
}
TabWmStoreConfig record = wmStoreConfigService.getByWmMainAccount(dto.getWmMainAccount(),
TabWmStoreConfig record = wmStoreConfigService.getWmStoreConfig(dto.getWmMallStoreId(),
dto.getStoreConfigType());
if (record == null) {
//新增
......@@ -118,7 +121,7 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
if (record == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "微盟商城店铺ID错误，查无数据");
}
TabWmStoreConfig memberCardConfig = wmStoreConfigService.getByWmMainAccount(record.getWmMainAccount(),
TabWmStoreConfig memberCardConfig = wmStoreConfigService.getWmStoreConfig(wmMallStoreId,
WmStoreConfigTypeEnum.MEMBER_CARD_CONFIG.getCode());
if (memberCardConfig == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(),
......@@ -133,7 +136,7 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
if (record == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "微盟商城店铺ID错误，查无数据");
}
TabWmStoreConfig orderConfig = wmStoreConfigService.getByWmMainAccount(record.getWmMainAccount(),
TabWmStoreConfig orderConfig = wmStoreConfigService.getWmStoreConfig(wmMallStoreId,
WmStoreConfigTypeEnum.ORDER_CONFIG.getCode());
if (orderConfig == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(),
......@@ -143,10 +146,14 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
}
@Override
public ServiceResponse<WmStoreConfigDTO> getWmStoreConfigByWmMainAccount(String wmMainAccount,
public ServiceResponse<WmStoreConfigDTO> getWmStoreConfig(Integer wmMallStoreId,
Integer wmStoreConfigType) {
TabWmStoreConfig record = wmStoreConfigService.getByWmMainAccount(wmMainAccount, wmStoreConfigType);
TabWmStore record = wmStoreService.getByWmMallStoreId(wmMallStoreId);
if (record == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "店铺不存在");
}
TabWmStoreConfig config = wmStoreConfigService.getWmStoreConfig(wmMallStoreId, wmStoreConfigType);
if (config == null) {
if (!WmStoreConfigTypeEnum.isRightCode(wmStoreConfigType)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "店铺配置类型值非法");
}
......@@ -154,13 +161,13 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(),
WmStoreConfigTypeEnum.getMessageByCode(wmStoreConfigType) + "还未配置");
}
return ServiceResponse.success(EntityUtil.changeEntityNew(WmStoreConfigDTO.class, record));
return ServiceResponse.success(EntityUtil.changeEntityNew(WmStoreConfigDTO.class, config));
}
@Override
public ServiceResponse<Set<String>> getWmStoreConfigByWmMainAccount(String wmMainAccount) {
public ServiceResponse<Set<String>> getWmStoreConfigKey(Integer wmMallStoreId) {
Set<String> result;
List<TabWmStoreConfig> wmStoreConfigList = wmStoreConfigService.listWmStoreConfigByWmMainAccount(wmMainAccount);
List<TabWmStoreConfig> wmStoreConfigList = wmStoreConfigService.listWmStoreConfig(wmMallStoreId);
//基本配置
result = Optional.ofNullable(wmStoreConfigList).orElse(new ArrayList<>())
.stream()
......
gic-platform-enterprise-service/src/main/resources/mapper/TabWmStoreConfigMapper.xml
......@@ -4,7 +4,7 @@
<resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabWmStoreConfig">
<id column="store_config_id" jdbcType="INTEGER" property="storeConfigId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="wm_main_account" jdbcType="VARCHAR" property="wmMainAccount" />
<result column="wm_mall_store_id" jdbcType="INTEGER" property="wmMallStoreId" />
<result column="store_config_type" jdbcType="INTEGER" property="storeConfigType" />
<result column="store_config_json" jdbcType="VARCHAR" property="storeConfigJson" />
<result column="status" jdbcType="INTEGER" property="status" />
......@@ -12,7 +12,7 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
store_config_id, enterprise_id, wm_main_account, store_config_type, store_config_json,
store_config_id, enterprise_id, wm_mall_store_id, store_config_type, store_config_json,
status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -26,10 +26,10 @@
where store_config_id = #{storeConfigId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabWmStoreConfig" useGeneratedKeys="true" keyProperty="storeConfigId">
insert into tab_wm_store_config (store_config_id, enterprise_id, wm_main_account,
insert into tab_wm_store_config (store_config_id, enterprise_id, wm_mall_store_id,
store_config_type, store_config_json, status,
create_time, update_time)
values (#{storeConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{wmMainAccount,jdbcType=VARCHAR},
values (#{storeConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{wmMallStoreId,jdbcType=INTEGER},
#{storeConfigType,jdbcType=INTEGER}, #{storeConfigJson,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
......@@ -42,8 +42,8 @@
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="wmMainAccount != null">
wm_main_account,
<if test="wmMallStoreId != null">
wm_mall_store_id,
</if>
<if test="storeConfigType != null">
store_config_type,
......@@ -68,8 +68,8 @@
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="wmMainAccount != null">
#{wmMainAccount,jdbcType=VARCHAR},
<if test="wmMallStoreId != null">
#{wmMallStoreId,jdbcType=INTEGER},
</if>
<if test="storeConfigType != null">
#{storeConfigType,jdbcType=INTEGER},
......@@ -94,8 +94,8 @@
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="wmMainAccount != null">
wm_main_account = #{wmMainAccount,jdbcType=VARCHAR},
<if test="wmMallStoreId != null">
wm_mall_store_id = #{wmMallStoreId,jdbcType=INTEGER},
</if>
<if test="storeConfigType != null">
store_config_type = #{storeConfigType,jdbcType=INTEGER},
......@@ -118,7 +118,7 @@
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabWmStoreConfig">
update tab_wm_store_config
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
wm_main_account = #{wmMainAccount,jdbcType=VARCHAR},
wm_mall_store_id = #{wmMallStoreId,jdbcType=INTEGER},
store_config_type = #{storeConfigType,jdbcType=INTEGER},
store_config_json = #{storeConfigJson,jdbcType=VARCHAR},
status = #{status,jdbcType=INTEGER},
......@@ -127,18 +127,18 @@
where store_config_id = #{storeConfigId,jdbcType=INTEGER}
</update>
<select id="getByWmMainAccount" resultMap="BaseResultMap">
<select id="getWmStoreConfig" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from tab_wm_store_config
where wm_main_account = #{wmMainAccount}
where wm_mall_store_id = #{wmMallStoreId}
and status = 1
and store_config_type = #{storeConfigType}
</select>
<select id="listWmStoreConfigByWmMainAccount" resultMap="BaseResultMap">
<select id="listWmStoreConfig" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from tab_wm_store_config
where wm_main_account = #{wmMainAccount}
where wm_mall_store_id = #{wmMallStoreId}
and status = 1
order by store_config_type
</select>
......
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmMallStoreController.java
......@@ -93,7 +93,7 @@ public class WmMallStoreController {
List<WmStoreVO> voList = list.stream()
.map(e -> {
WmStoreVO vo = EntityUtil.changeEntityNew(WmStoreVO.class, e);
ServiceResponse<Set<String>> configSet = wmStoreApiService.getWmStoreConfigByWmMainAccount(e.getWmMainAccount());
ServiceResponse<Set<String>> configSet = wmStoreApiService.getWmStoreConfigKey(e.getWmMallStoreId());
if (configSet.isSuccess()) {
Set<String> set = configSet.getResult();
if (set.contains(String.valueOf(WmStoreConfigTypeEnum.COUPON_CONFIG.getCode()))) {
......@@ -304,15 +304,15 @@ public class WmMallStoreController {
dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
return OperationResultUtils
.operationResult(wmStoreApiService.saveOrUpdateWmStoreConfig(dto),
OperationResultUtils.LOG_EDIT + "微盟商城-店铺配置"
"店铺配置"
+ WmStoreConfigTypeEnum.getMessageByCode(dto.getStoreConfigType()),
dto.getWmMainAccount());
"微盟商城");
}
@RequestMapping("/get-wm-store-config-by-wm-main-account")
public RestResponse getWmStoreConfigByWmMainAccount(String wmMainAccount, Integer wmStoreConfigType) {
@RequestMapping("/get-wm-store-config")
public RestResponse getWmStoreConfig(Integer wmMallStoreId, Integer wmStoreConfigType) {
return ResultControllerUtils
.commonResult(wmStoreApiService.getWmStoreConfigByWmMainAccount(wmMainAccount, wmStoreConfigType));
.commonResult(wmStoreApiService.getWmStoreConfig(wmMallStoreId, wmStoreConfigType));
}
@RequestMapping("/bind-coupon")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment