Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/WmOrderConfigDTO.java

+package com.gic.enterprise.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 微盟商城店铺-订单配置
+ * @ClassName: WmOrderConfigDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/4/14 4:08 PM

+ */
+public class WmOrderConfigDTO implements Serializable{
+    private static final long serialVersionUID = -7720153967192439149L;
+
+    /**
+     *
+     */
+    private Integer orderConfigId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 微盟主账号(平台唯一)，用于关联配置
+     */
+    private String wmMainAccount;
+
+    /**
+     * 微盟订单是否进入了线下订单系统（例如ERP） 1:是 0:不是
+     */
+    private Integer wmOrderToOffline;
+
+    /**
+     * 在线下订单系统是否可以区分出微盟订单 1:是 0:否
+     */
+    private Integer offlineDifferentiateWm;
+
+    /**
+     * 订单获取方案 1:从微盟获取订单 2:从ERP获取订单
+     */
+    private Integer orderFromMode;
+
+    /**
+     * 1:有效
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    public Integer getOrderConfigId() {
+        return orderConfigId;
+    }
+
+    public WmOrderConfigDTO setOrderConfigId(Integer orderConfigId) {
+        this.orderConfigId = orderConfigId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public WmOrderConfigDTO setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public String getWmMainAccount() {
+        return wmMainAccount;
+    }
+
+    public WmOrderConfigDTO setWmMainAccount(String wmMainAccount) {
+        this.wmMainAccount = wmMainAccount;
+        return this;
+    }
+
+    public Integer getWmOrderToOffline() {
+        return wmOrderToOffline;
+    }
+
+    public WmOrderConfigDTO setWmOrderToOffline(Integer wmOrderToOffline) {
+        this.wmOrderToOffline = wmOrderToOffline;
+        return this;
+    }
+
+    public Integer getOfflineDifferentiateWm() {
+        return offlineDifferentiateWm;
+    }
+
+    public WmOrderConfigDTO setOfflineDifferentiateWm(Integer offlineDifferentiateWm) {
+        this.offlineDifferentiateWm = offlineDifferentiateWm;
+        return this;
+    }
+
+    public Integer getOrderFromMode() {
+        return orderFromMode;
+    }
+
+    public WmOrderConfigDTO setOrderFromMode(Integer orderFromMode) {
+        this.orderFromMode = orderFromMode;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public WmOrderConfigDTO setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public WmOrderConfigDTO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public WmOrderConfigDTO setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+}

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/WmStoreApiService.java

@@ -2,6 +2,7 @@ package com.gic.enterprise.service;
 
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.enterprise.dto.WmMemberCardConfigDTO;
+import com.gic.enterprise.dto.WmOrderConfigDTO;
 import com.gic.enterprise.dto.WmStoreDTO;
 
 import java.util.List;
@@ -68,4 +69,24 @@ public interface WmStoreApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.WmMemberCardConfigDTO>

     
*/
     ServiceResponse<WmMemberCardConfigDTO> getWmMemberCardConfigByWmMainAccount(String wmMainAccount);
+
+    /**
+     * 订单配置
+     * @Title: saveOrUpdateWmOrderConfig

+     * @Description:
+    
* @author guojuxing
+     * @param dto

+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Integer>

+    
*/
+    ServiceResponse<Integer> saveOrUpdateWmOrderConfig(WmOrderConfigDTO dto);
+
+    /**
+     * 根据微盟主账号查询订单配置
+     * @Title: getWmOrderConfigByWmMainAccount

+     * @Description:
+    
* @author guojuxing
+     * @param wmMainAccount

+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.WmOrderConfigDTO>

+    
*/
+    ServiceResponse<WmOrderConfigDTO> getWmOrderConfigByWmMainAccount(String wmMainAccount);
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabWmOrderConfigMapper.java

+package com.gic.enterprise.dao.mapper;
+
+import com.gic.enterprise.entity.TabWmOrderConfig;
+
+public interface TabWmOrderConfigMapper {
+    /**
+     * 根据主键删除
+     *
+     * @param orderConfigId 主键
+     * @return 更新条目数
+     */
+    int deleteByPrimaryKey(Integer orderConfigId);
+
+    /**
+     * 插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insert(TabWmOrderConfig record);
+
+    /**
+     * 动态插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insertSelective(TabWmOrderConfig record);
+
+    /**
+     * 根据主键查询
+     *
+     * @param orderConfigId 主键
+     * @return 实体对象
+     */
+    TabWmOrderConfig selectByPrimaryKey(Integer orderConfigId);
+
+    /**
+     * 根据主键动态更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKeySelective(TabWmOrderConfig record);
+
+    /**
+     * 根据主键更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKey(TabWmOrderConfig record);
+
+    TabWmOrderConfig getByWmMainAccount(String wmMainAccount);
+}
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabWmOrderConfig.java

+package com.gic.enterprise.entity;
+
+import java.util.Date;
+
+/**
+ * tab_wm_order_config
+ */
+public class TabWmOrderConfig {
+    /**
+     * 
+     */
+    private Integer orderConfigId;
+
+    /**
+     * 
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 微盟主账号(平台唯一)，用于关联配置
+     */
+    private String wmMainAccount;
+
+    /**
+     * 微盟订单是否进入了线下订单系统（例如ERP） 1:是 0:不是
+     */
+    private Integer wmOrderToOffline;
+
+    /**
+     * 在线下订单系统是否可以区分出微盟订单 1:是 0:否
+     */
+    private Integer offlineDifferentiateWm;
+
+    /**
+     * 订单获取方案 1:从微盟获取订单 2:从ERP获取订单
+     */
+    private Integer orderFromMode;
+
+    /**
+     * 1:有效
+     */
+    private Integer status;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    public Integer getOrderConfigId() {
+        return orderConfigId;
+    }
+
+    public TabWmOrderConfig setOrderConfigId(Integer orderConfigId) {
+        this.orderConfigId = orderConfigId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public TabWmOrderConfig setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public String getWmMainAccount() {
+        return wmMainAccount;
+    }
+
+    public TabWmOrderConfig setWmMainAccount(String wmMainAccount) {
+        this.wmMainAccount = wmMainAccount;
+        return this;
+    }
+
+    public Integer getWmOrderToOffline() {
+        return wmOrderToOffline;
+    }
+
+    public TabWmOrderConfig setWmOrderToOffline(Integer wmOrderToOffline) {
+        this.wmOrderToOffline = wmOrderToOffline;
+        return this;
+    }
+
+    public Integer getOfflineDifferentiateWm() {
+        return offlineDifferentiateWm;
+    }
+
+    public TabWmOrderConfig setOfflineDifferentiateWm(Integer offlineDifferentiateWm) {
+        this.offlineDifferentiateWm = offlineDifferentiateWm;
+        return this;
+    }
+
+    public Integer getOrderFromMode() {
+        return orderFromMode;
+    }
+
+    public TabWmOrderConfig setOrderFromMode(Integer orderFromMode) {
+        this.orderFromMode = orderFromMode;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public TabWmOrderConfig setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public TabWmOrderConfig setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public TabWmOrderConfig setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+}
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/WmOrderConfigService.java

+package com.gic.enterprise.service;
+
+import com.gic.enterprise.dto.WmOrderConfigDTO;
+import com.gic.enterprise.entity.TabWmOrderConfig;
+
+public interface WmOrderConfigService {
+
+    /**
+     * 新增订单配置（商城店铺配置）
+     * @Title: saveWmOrderConfig

+     * @Description:
+    
* @author guojuxing
+     * @param dto

+     * @return  java.lang.Integer

+    
*/
+    Integer saveWmOrderConfig(WmOrderConfigDTO dto);
+
+    void editWmOrderConfig(WmOrderConfigDTO dto);
+
+    /**
+     * 根据微盟主账号查询对应的订单配置
+     * @Title: getByWmMainAccount

+     * @Description:
+    
* @author guojuxing
+     * @param wmMainAccount

+     * @return  com.gic.enterprise.entity.TabWmOrderConfig

+    
*/
+    TabWmOrderConfig getByWmMainAccount(String wmMainAccount);
+}

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/WmOrderConfigServiceImpl.java

+package com.gic.enterprise.service.impl;
+
+import com.gic.commons.util.EntityUtil;
+import com.gic.enterprise.dao.mapper.TabWmOrderConfigMapper;
+import com.gic.enterprise.dto.WmOrderConfigDTO;
+import com.gic.enterprise.entity.TabWmOrderConfig;
+import com.gic.enterprise.service.WmOrderConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+@Service("wmOrderConfigService")
+public class WmOrderConfigServiceImpl implements WmOrderConfigService{
+    @Autowired
+    private TabWmOrderConfigMapper tabWmOrderConfigMapper;
+
+    @Override
+    public Integer saveWmOrderConfig(WmOrderConfigDTO dto) {
+        Date now = new Date();
+        dto.setCreateTime(now);
+        dto.setUpdateTime(now);
+        dto.setStatus(1);
+        TabWmOrderConfig record = EntityUtil.changeEntityNew(TabWmOrderConfig.class, dto);
+        tabWmOrderConfigMapper.insert(record);
+        return record.getOrderConfigId();
+    }
+
+    @Override
+    public void editWmOrderConfig(WmOrderConfigDTO dto) {
+        dto.setUpdateTime(new Date());
+        TabWmOrderConfig record = EntityUtil.changeEntityNew(TabWmOrderConfig.class, dto);
+        tabWmOrderConfigMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public TabWmOrderConfig getByWmMainAccount(String wmMainAccount) {
+        return tabWmOrderConfigMapper.getByWmMainAccount(wmMainAccount);
+    }
+}

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/WmStoreApiServiceImpl.java

@@ -4,8 +4,11 @@ import java.util.List;
 import java.util.Optional;
 
 import com.gic.enterprise.dto.WmMemberCardConfigDTO;
+import com.gic.enterprise.dto.WmOrderConfigDTO;
 import com.gic.enterprise.entity.TabWmMemberCardConfig;
+import com.gic.enterprise.entity.TabWmOrderConfig;
 import com.gic.enterprise.service.WmMemberCardConfigService;
+import com.gic.enterprise.service.WmOrderConfigService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +28,8 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
     private WmStoreService wmStoreService;
     @Autowired
     private WmMemberCardConfigService wmMemberCardConfigService;
+    @Autowired
+    private WmOrderConfigService wmOrderConfigService;
 
     @Override
     public ServiceResponse<Integer> saveWmStore(WmStoreDTO wmStoreDTO) {
@@ -96,6 +101,36 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
         return ServiceResponse.success(EntityUtil.changeEntityNew(WmMemberCardConfigDTO.class, record));
     }
 
+    @Override
+    public ServiceResponse<Integer> saveOrUpdateWmOrderConfig(WmOrderConfigDTO dto) {
+        if (dto.getEnterpriseId() == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户ID不能为空");
+        }
+        dto.setOrderFromMode(Optional.ofNullable(dto.getOrderFromMode()).orElse(1));
+        dto.setWmOrderToOffline(Optional.ofNullable(dto.getWmOrderToOffline()).orElse(0));
+        dto.setOfflineDifferentiateWm(Optional.ofNullable(dto.getOfflineDifferentiateWm()).orElse(0));
+        TabWmStore wmStore = wmStoreService.getByWmMainAccount(dto.getWmMainAccount());
+        if (wmStore == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "微盟主账号错误，查无数据");
+        }
+        TabWmOrderConfig record = wmOrderConfigService.getByWmMainAccount(dto.getWmMainAccount());
+        if (record == null) {
+            return ServiceResponse.success(wmOrderConfigService.saveWmOrderConfig(dto));
+        }
+        dto.setOrderConfigId(record.getOrderConfigId());
+        wmOrderConfigService.editWmOrderConfig(dto);
+        return ServiceResponse.success(record.getOrderConfigId());
+    }
+
+    @Override
+    public ServiceResponse<WmOrderConfigDTO> getWmOrderConfigByWmMainAccount(String wmMainAccount) {
+        TabWmOrderConfig record = wmOrderConfigService.getByWmMainAccount(wmMainAccount);
+        if (record == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "还未配置");
+        }
+        return ServiceResponse.success(EntityUtil.changeEntityNew(WmOrderConfigDTO.class, record));
+    }
+
     private ServiceResponse validWmMemberCardConfig(WmMemberCardConfigDTO dto) {
         if (dto.getEnterpriseId() == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户ID不能为空");

gic-platform-enterprise-service/src/main/resources/mapper/TabWmOrderConfigMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gic.enterprise.dao.mapper.TabWmOrderConfigMapper">
+  <resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabWmOrderConfig">
+    <id column="order_config_id" jdbcType="INTEGER" property="orderConfigId" />
+    <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
+    <result column="wm_main_account" jdbcType="VARCHAR" property="wmMainAccount" />
+    <result column="wm_order_to_offline" jdbcType="INTEGER" property="wmOrderToOffline" />
+    <result column="offline_differentiate_wm" jdbcType="INTEGER" property="offlineDifferentiateWm" />
+    <result column="order_from_mode" jdbcType="INTEGER" property="orderFromMode" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    order_config_id, enterprise_id, wm_main_account, wm_order_to_offline, offline_differentiate_wm, 
+    order_from_mode, status, create_time, update_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tab_wm_order_config
+    where order_config_id = #{orderConfigId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tab_wm_order_config
+    where order_config_id = #{orderConfigId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.gic.enterprise.entity.TabWmOrderConfig" useGeneratedKeys="true" keyProperty="orderConfigId">
+    insert into tab_wm_order_config (order_config_id, enterprise_id, wm_main_account, 
+      wm_order_to_offline, offline_differentiate_wm, 
+      order_from_mode, status, create_time, 
+      update_time)
+    values (#{orderConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{wmMainAccount,jdbcType=VARCHAR}, 
+      #{wmOrderToOffline,jdbcType=INTEGER}, #{offlineDifferentiateWm,jdbcType=INTEGER}, 
+      #{orderFromMode,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabWmOrderConfig">
+    insert into tab_wm_order_config
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="orderConfigId != null">
+        order_config_id,
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id,
+      </if>
+      <if test="wmMainAccount != null">
+        wm_main_account,
+      </if>
+      <if test="wmOrderToOffline != null">
+        wm_order_to_offline,
+      </if>
+      <if test="offlineDifferentiateWm != null">
+        offline_differentiate_wm,
+      </if>
+      <if test="orderFromMode != null">
+        order_from_mode,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="orderConfigId != null">
+        #{orderConfigId,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseId != null">
+        #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="wmMainAccount != null">
+        #{wmMainAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="wmOrderToOffline != null">
+        #{wmOrderToOffline,jdbcType=INTEGER},
+      </if>
+      <if test="offlineDifferentiateWm != null">
+        #{offlineDifferentiateWm,jdbcType=INTEGER},
+      </if>
+      <if test="orderFromMode != null">
+        #{orderFromMode,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabWmOrderConfig">
+    update tab_wm_order_config
+    <set>
+      <if test="enterpriseId != null">
+        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="wmMainAccount != null">
+        wm_main_account = #{wmMainAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="wmOrderToOffline != null">
+        wm_order_to_offline = #{wmOrderToOffline,jdbcType=INTEGER},
+      </if>
+      <if test="offlineDifferentiateWm != null">
+        offline_differentiate_wm = #{offlineDifferentiateWm,jdbcType=INTEGER},
+      </if>
+      <if test="orderFromMode != null">
+        order_from_mode = #{orderFromMode,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where order_config_id = #{orderConfigId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabWmOrderConfig">
+    update tab_wm_order_config
+    set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      wm_main_account = #{wmMainAccount,jdbcType=VARCHAR},
+      wm_order_to_offline = #{wmOrderToOffline,jdbcType=INTEGER},
+      offline_differentiate_wm = #{offlineDifferentiateWm,jdbcType=INTEGER},
+      order_from_mode = #{orderFromMode,jdbcType=INTEGER},
+      status = #{status,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where order_config_id = #{orderConfigId,jdbcType=INTEGER}
+  </update>
+
+  <select id="getByWmMainAccount" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List"></include>
+    FROM tab_wm_order_config
+    where status = 1
+    and wm_main_account = #{wmMainAccount}
+  </select>
+</mapper>
\ No newline at end of file

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmMallStoreController.java

 package com.gic.enterprise.web.controller.wm;
 
-import com.gic.api.base.commons.ServiceResponse;
-import com.gic.enterprise.constant.MallModeEnum;
-import com.gic.enterprise.dto.WmMemberCardConfigDTO;
-import com.gic.enterprise.utils.ResultControllerUtils;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.download.utils.OperationResultUtils;
+import com.gic.enterprise.constant.MallModeEnum;
+import com.gic.enterprise.dto.WmMemberCardConfigDTO;
+import com.gic.enterprise.dto.WmOrderConfigDTO;
 import com.gic.enterprise.dto.WmStoreDTO;
 import com.gic.enterprise.service.WmStoreApiService;
+import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @RestController
 @RequestMapping("/wm-mall-store")
 public class WmMallStoreController {
@@ -87,4 +88,17 @@ public class WmMallStoreController {
         return ResultControllerUtils
                 .commonResult(wmStoreApiService.getWmMemberCardConfigByWmMainAccount(wmMainAccount));
     }
+
+    @RequestMapping("/save-or-update-wm-order-config")
+    public RestResponse saveOrUpdateWmOrderConfig(WmOrderConfigDTO dto) {
+        dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        return OperationResultUtils.operationResult(wmStoreApiService.saveOrUpdateWmOrderConfig(dto),
+                OperationResultUtils.LOG_EDIT + "微盟商城-订单配置", dto.getWmMainAccount());
+    }
+
+    @RequestMapping("/get-wm-order-config-by-wm-main-account")
+    public RestResponse getWmOrderConfigByWmMainAccount(String wmMainAccount) {
+        return ResultControllerUtils
+                .commonResult(wmStoreApiService.getWmOrderConfigByWmMainAccount(wmMainAccount));
+    }
 }