1. 根据货号搜索商品（更新后为严格关键字搜索）

2. 订单详情页新增单位/重量 显示
3. 其他商品申报功能（商家端，店铺设置中维护，其中星光已经维护好）
4. 订单支持录入合同号（暂未放入申报接口中，周一沟通后完成）

framework/src/main/java/cn/lili/modules/order/customs/CustomPayloadEnums.java

@@ -0,0 +1,19 @@
+package cn.lili.modules.order.customs;
+
+import lombok.ToString;
+
+@ToString
+public enum CustomPayloadEnums {
+    JiangyinXingguang("DXPENT0000474373", "DXP", "江阴星光进出口有限公司", "3216960A23", "dcits123456", "test");
+
+    CustomPayloadEnums(String dxpId, String dxpMode, String copName, String copCode, String signKey, String note) {
+        this.payload = new CustomsPayload();
+        payload.dxpId = dxpId;
+        payload.dxpMode = dxpMode;
+        payload.copName = copName;
+        payload.copCode = copCode;
+        payload.signKey = signKey;
+        payload.note = note;
+    }
+    CustomsPayload payload;
+}

framework/src/main/java/cn/lili/modules/order/customs/CustomPayload.java

@@ -1,20 +1,11 @@
 package cn.lili.modules.order.customs;
 
-import lombok.ToString;
-
-@ToString
-public enum CustomPayload {
-    JiangyinXingguang("DXPENT0000474373", "DXP", "江阴星光进出口有限公司", "3216960A23", "dcits123456", "test");
-
-    CustomPayload(String dxpId, String dxpMode, String copName, String copCode, String signKey, String note) {
-        this.dxpId = dxpId;
-        this.dxpMode = dxpMode;
-        this.copName = copName;
-        this.copCode = copCode;
-        this.signKey = signKey;
-        this.note = note;
-    }
+import cn.hutool.core.bean.BeanUtil;
+import cn.lili.modules.store.entity.dos.StoreCustoms;
+import lombok.Data;
 
+@Data
+public class CustomsPayload {
     /** 向中国电子口岸数据中心申请数据交换平台的用户编号 */
     public String dxpId;
     /** 默认为DXP,指中国电子口岸数据交换平台 */
@@ -27,4 +18,11 @@ public enum CustomPayload {
     public String signKey;
     /** 备注 */
     public String note;
+
+    public static CustomsPayload fromSetting(StoreCustoms customs){
+        if (customs == null){
+            return null;
+        }
+        return BeanUtil.toBean(customs, CustomsPayload.class);
+    }
 }

framework/src/main/java/cn/lili/modules/order/customs/JiangyinServiceManager.java

@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
+import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.AesEncrypt;
 import cn.lili.modules.order.customs.converter.CustomsReqConverter;
@@ -15,6 +16,7 @@ import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
 import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
 import cn.lili.modules.order.order.mapper.OrderCustomsMapper;
 import cn.lili.modules.order.order.mapper.OrderMapper;
+import cn.lili.modules.store.mapper.StoreCustomsMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -22,7 +24,9 @@ import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 
 import static cn.lili.common.enums.ResultCode.ORDER_CUSTOMS_ERROR;
 
@@ -38,21 +42,27 @@ public class JiangyinServiceManager {
 
     private final OrderCustomsMapper orderCustomsMapper;
 
+    private final StoreCustomsMapper storeCustomsMapper;
+
+    private final Map<String, CustomsPayload> payloadCache = new ConcurrentHashMap<>();
+
     @Autowired
     public JiangyinServiceManager(@Qualifier("jiangyinServiceBeanReqConverter") CustomsReqConverter converter,
                                   OrderMapper orderMapper,
-                                  OrderCustomsMapper orderCustomsMapper) {
+                                  OrderCustomsMapper orderCustomsMapper,
+                                  StoreCustomsMapper storeCustomsMapper) {
         this.converter = converter;
         this.orderMapper = orderMapper;
         this.orderCustomsMapper = orderCustomsMapper;
+        this.storeCustomsMapper = storeCustomsMapper;
     }
 
     public boolean push(OrderDetailVO detailVO){
         Assert.isTrue(!detailVO.getOrder().getCustomsFlag(), () -> new ServiceException(ORDER_CUSTOMS_ERROR,"订单已推送海关，请勿重复推送"));
         Assert.isTrue(PayStatusEnum.PAID.name().equals(detailVO.getOrder().getPayStatus()),
                 () -> new ServiceException(ORDER_CUSTOMS_ERROR,"订单尚未支付，无法推送海关"));
-        // 企业凭证相关（后续动态获取）
-        CustomPayload payload = CustomPayload.JiangyinXingguang;
+        // 企业凭证信息
+        CustomsPayload payload = getStorePayload(detailVO.getOrder().getStoreId());
         OrderCustoms customsRec = new OrderCustoms();
         log.info("method input param: {}, payload: {}", JSONUtil.toJsonStr(detailVO), payload.toString());
         // 报文内容(密文)
@@ -86,5 +96,11 @@ public class JiangyinServiceManager {
         orderCustomsMapper.insert(customsRec);
         return success;
     }
+
+    CustomsPayload getStorePayload(String storeId){
+        return Optional.ofNullable(
+                payloadCache.computeIfAbsent(storeId, key -> CustomsPayload.fromSetting(storeCustomsMapper.selectById(key)))
+        ).orElseThrow(() -> new ServiceException(ResultCode.ORDER_CUSTOMS_ERROR, "未找到商家海关凭证"));
+    }
 }
 

framework/src/main/java/cn/lili/modules/order/customs/converter/CustomsReqConverter.java

@@ -1,11 +1,11 @@
 package cn.lili.modules.order.customs.converter;
 
-import cn.lili.modules.order.customs.CustomPayload;
 import cn.lili.modules.order.customs.CustomsExchange;
+import cn.lili.modules.order.customs.CustomsPayload;
 
 public interface CustomsReqConverter{
     /** 生成报文 */
-    String toReq(CustomsExchange exchange, CustomPayload payload);
+    String toReq(CustomsExchange exchange, CustomsPayload payload);
 
     /** 获取签名 */
     String getSign(String content, String key);

framework/src/main/java/cn/lili/modules/order/customs/converter/JiangyinServiceBeanReqConverter.java

@@ -9,8 +9,8 @@ import cn.lili.common.utils.JaxbUtils;
 import cn.lili.modules.goods.entity.dos.Goods;
 import cn.lili.modules.goods.entity.dto.GoodsSearchParams;
 import cn.lili.modules.goods.service.GoodsService;
-import cn.lili.modules.order.customs.CustomPayload;
 import cn.lili.modules.order.customs.CustomsExchange;
+import cn.lili.modules.order.customs.CustomsPayload;
 import cn.lili.modules.order.customs.model.CEB303Message;
 import cn.lili.modules.order.order.entity.dos.OrderItem;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +34,7 @@ public class JiangyinServiceBeanReqConverter implements CustomsReqConverter{
     }
 
     @Override
-    public String toReq(CustomsExchange exchange, CustomPayload payload) {
+    public String toReq(CustomsExchange exchange, CustomsPayload payload) {
         return JaxbUtils.convertToXml(converterToMsg(exchange, payload));
     }
 
@@ -58,7 +58,7 @@ public class JiangyinServiceBeanReqConverter implements CustomsReqConverter{
                 .isPresent();
     }
 
-    private CEB303Message converterToMsg(CustomsExchange exchange, CustomPayload payload){
+    private CEB303Message converterToMsg(CustomsExchange exchange, CustomsPayload payload){
         exchange.setAppTime(DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_PATTERN));
         // 批量获取商品信息
         String ids = exchange.getOrderDetailVO().getOrderItems().stream().map(OrderItem::getGoodsId).collect(Collectors.joining(","));

framework/src/main/java/cn/lili/modules/order/customs/converter/JiangyinServiceReqConverter.java

@@ -10,8 +10,8 @@ import cn.lili.common.exception.UnitIllegalException;
 import cn.lili.modules.goods.entity.dos.Goods;
 import cn.lili.modules.goods.entity.dto.GoodsSearchParams;
 import cn.lili.modules.goods.service.GoodsService;
-import cn.lili.modules.order.customs.CustomPayload;
 import cn.lili.modules.order.customs.CustomsExchange;
+import cn.lili.modules.order.customs.CustomsPayload;
 import cn.lili.modules.order.order.entity.dos.OrderItem;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -37,7 +37,7 @@ public class JiangyinServiceReqConverter implements CustomsReqConverter{
     }
 
     @Override
-    public String toReq(CustomsExchange exchange, CustomPayload payload) {
+    public String toReq(CustomsExchange exchange, CustomsPayload payload) {
         // map解析
         Map<String, Object> m = orderToMap(exchange, payload);
         Document ceb = XmlUtil.mapToXml(m, "ceb:CEB303Message");
@@ -78,7 +78,7 @@ public class JiangyinServiceReqConverter implements CustomsReqConverter{
      * @param payload 存根（企业凭证相关）
      * @return 符合报文格式的Map
      */
-    private Map<String, Object> orderToMap(CustomsExchange exchange, CustomPayload payload){
+    private Map<String, Object> orderToMap(CustomsExchange exchange, CustomsPayload payload){
         Map<String, Object> reqMap = new LinkedHashMap<>();
         // 1. ceb:order
         reqMap.put(CEB_PREFIX + "Order", order(exchange, payload));
@@ -94,7 +94,7 @@ public class JiangyinServiceReqConverter implements CustomsReqConverter{
      * @param payload 存根（企业凭证相关）
      * @return 报文List数据
      */
-    private List<Map<String, Object>> order(CustomsExchange exchange, CustomPayload payload){
+    private List<Map<String, Object>> order(CustomsExchange exchange, CustomsPayload payload){
         exchange.setAppTime(DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_PATTERN));
         List<Map<String, Object>> orderList = new ArrayList<>(0);
         Optional.ofNullable(exchange.getOrderDetailVO().getOrderItems()).ifPresent(items -> {
@@ -183,7 +183,7 @@ public class JiangyinServiceReqConverter implements CustomsReqConverter{
      * @param payload 存根信息
      * @return 基础报文传输Map列表
      */
-    private List<Map<String, Object>> baseTransfer(CustomPayload payload){
+    private List<Map<String, Object>> baseTransfer(CustomsPayload payload){
         List<Map<String, Object>> transfers = new ArrayList<>();
         Map<String, Object> transfer = new HashMap<>(8);
         // 传输企业代码

framework/src/main/java/cn/lili/modules/order/customs/model/CEB303Message.java

@@ -1,8 +1,7 @@
 package cn.lili.modules.order.customs.model;
 
-import cn.lili.modules.order.customs.CustomPayload;
 import cn.lili.modules.order.customs.CustomsExchange;
-import lombok.Builder;
+import cn.lili.modules.order.customs.CustomsPayload;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -32,7 +31,7 @@ public class CEB303Message {
     @XmlElement(name = "BaseTransfer", namespace = NAMESPACE_CEB_URI)
     private BaseTransfer baseTransfer;
 
-    public CEB303Message(CustomsExchange exchange, CustomPayload payload){
+    public CEB303Message(CustomsExchange exchange, CustomsPayload payload){
         this.guid = exchange.getGuid();
         this.order = new Order(exchange, payload);
         this.baseTransfer = BaseTransfer.builder()

framework/src/main/java/cn/lili/modules/order/customs/model/Order.java

@@ -1,8 +1,8 @@
 package cn.lili.modules.order.customs.model;
 
 import cn.lili.common.enums.JGS20Unit;
-import cn.lili.modules.order.customs.CustomPayload;
 import cn.lili.modules.order.customs.CustomsExchange;
+import cn.lili.modules.order.customs.CustomsPayload;
 import cn.lili.modules.order.order.entity.dos.OrderItem;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -32,7 +32,7 @@ public class Order {
     @XmlElement(name = "OrderList", namespace = NAMESPACE_CEB_URI)
     private List<OrderList> orderList;
 
-    public Order(CustomsExchange exchange, CustomPayload payload){
+    public Order(CustomsExchange exchange, CustomsPayload payload){
         this.orderHead = OrderHead.builder()
                 .guid(exchange.getGuid())
                 .appType("1")

framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java

@@ -23,6 +23,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.Size;
 import java.util.Date;
 import java.util.Optional;
 
@@ -153,6 +154,10 @@ public class Order extends BaseEntity {
     @ApiModelProperty(value = "商品数量")
     private Integer goodsNum;
 
+    @Size(max = 200, message = "合同号不能超过200个字符")
+    @ApiModelProperty(value = "合同号")
+    private String contractNo;
+
     @ApiModelProperty(value = "买家订单备注")
     private String remark;
 

framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java

@@ -85,4 +85,11 @@ public interface OrderMapper extends BaseMapper<Order> {
     List<Order> queryListByParams(@Param(Constants.WRAPPER) Wrapper<Order> queryWrapper);
 
 
+    /**
+     * 更新订单合同号
+     * @param orderSn 订单编号
+     * @param contractNo 合同编号
+     */
+    @Update("update li_order o set o.contract_no = #{contractNo} where o.sn = #{orderSn}")
+    void updateContractNo(String orderSn, String contractNo);
 }

framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java

@@ -212,6 +212,13 @@ public interface OrderService extends IService<Order> {
     void systemComplete(String orderSn);
 
     /**
+     * 订单更新合同号
+     * @param orderSn 订单编号
+     * @param contractNo 合同号
+     */
+    void updateContractNo(String orderSn, String contractNo);
+
+    /**
      * 通过trade 获取订单列表
      *
      * @param tradeSn 交易编号

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java

@@ -532,6 +532,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         complete(order, orderSn);
     }
 
+    @Override
+    @OrderLogPoint(description = "'订单['+#orderSn+']更新合同号['+#contractNo+']'", orderSn = "#orderSn")
+    public void updateContractNo(String orderSn, String contractNo) {
+        this.baseMapper.updateContractNo(orderSn, contractNo);
+    }
+
     /**
      * 完成订单方法封装
      *

framework/src/main/java/cn/lili/modules/store/entity/dos/StoreCustoms.java

@@ -0,0 +1,29 @@
+package cn.lili.modules.store.entity.dos;
+
+import cn.lili.mybatis.BaseIdEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@TableName("li_store_customs")
+public class StoreCustoms extends BaseIdEntity {
+    /** 向中国电子口岸数据中心申请数据交换平台的用户编号 */
+    @ApiModelProperty(value = "向中国电子口岸数据中心申请数据交换平台的用户编号")
+    public String dxpId;
+    /** 默认为DXP,指中国电子口岸数据交换平台 */
+    @ApiModelProperty(value = "默认为DXP,指中国电子口岸数据交换平台")
+    public String dxpMode;
+    /** 报文传输的企业代码（海关编码，需要与接入客户端的企业身份一致） */
+    @ApiModelProperty(value = "报文传输的企业代码（海关编码，需要与接入客户端的企业身份一致）")
+    public String copCode;
+    /** 报文传输的企业名称 */
+    @ApiModelProperty(value = "报文传输的企业名称")
+    public String copName;
+    /** 签名key */
+    @ApiModelProperty(value = "签名key")
+    public String signKey;
+    /** 备注 */
+    @ApiModelProperty(value = "备注")
+    public String note;
+}

framework/src/main/java/cn/lili/modules/store/entity/vos/StoreSettingVO.java

@@ -0,0 +1,34 @@
+package cn.lili.modules.store.entity.vos;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 店铺VO
+ *
+ * @author pikachu
+ * @since 2020-03-07 17:02:05
+ */
+@Data
+public class StoreSettingVO extends StoreVO {
+
+    /** 向中国电子口岸数据中心申请数据交换平台的用户编号 */
+    @ApiModelProperty(value = "向中国电子口岸数据中心申请数据交换平台的用户编号")
+    public String dxpId;
+    /** 默认为DXP,指中国电子口岸数据交换平台 */
+    @ApiModelProperty(value = "默认为DXP,指中国电子口岸数据交换平台")
+    public String dxpMode;
+    /** 报文传输的企业代码（海关编码，需要与接入客户端的企业身份一致） */
+    @ApiModelProperty(value = "报文传输的企业代码（海关编码，需要与接入客户端的企业身份一致）")
+    public String copCode;
+    /** 报文传输的企业名称 */
+    @ApiModelProperty(value = "报文传输的企业名称")
+    public String copName;
+    /** 签名key */
+    @ApiModelProperty(value = "签名key")
+    public String signKey;
+    /** 备注 */
+    @ApiModelProperty(value = "备注")
+    public String note;
+
+}

framework/src/main/java/cn/lili/modules/store/mapper/StoreCustomsMapper.java

@@ -0,0 +1,15 @@
+package cn.lili.modules.store.mapper;
+
+import cn.lili.modules.store.entity.dos.StoreCustoms;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 商家海关凭证数据处理层
+ *
+ * @author Chopper
+ * @since 2020/11/17 4:27 下午
+ */
+public interface StoreCustomsMapper extends BaseMapper<StoreCustoms> {
+
+}

framework/src/main/java/cn/lili/modules/store/mapper/StoreMapper.java

@@ -1,6 +1,7 @@
 package cn.lili.modules.store.mapper;
 
 import cn.lili.modules.store.entity.dos.Store;
+import cn.lili.modules.store.entity.vos.StoreSettingVO;
 import cn.lili.modules.store.entity.vos.StoreVO;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -28,6 +29,15 @@ public interface StoreMapper extends BaseMapper<Store> {
     StoreVO getStoreDetail(String id);
 
     /**
+     * 获取店铺详细
+     *
+     * @param id 店铺ID
+     * @return 店铺VO
+     */
+    @Select("select s.*,d.*,c.* from li_store s inner join li_store_detail d on s.id=d.store_id left join li_store_customs c on s.id = c.id where s.id=#{id} ")
+    StoreSettingVO getStoreSetting(String id);
+
+    /**
      * 获取店铺分页列表
      *
      * @param page         分页

framework/src/main/java/cn/lili/modules/store/service/StoreDetailService.java

@@ -2,6 +2,7 @@ package cn.lili.modules.store.service;
 
 import cn.hutool.core.date.DateTime;
 import cn.lili.modules.store.entity.dos.Store;
+import cn.lili.modules.store.entity.dos.StoreCustoms;
 import cn.lili.modules.store.entity.dos.StoreDetail;
 import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
 import cn.lili.modules.store.entity.dto.StoreSettingDTO;
@@ -138,4 +139,11 @@ public interface StoreDetailService extends IService<StoreDetail> {
      * @param dateTime 结算日
      */
     void updateSettlementDay(String storeId, DateTime dateTime);
+
+    /**
+     * 修改商家海关凭证
+     * @param customs 商家设置
+     * @return 是否修改成功
+     */
+    Boolean editStoreCustoms(StoreCustoms customs);
 }

framework/src/main/java/cn/lili/modules/store/service/StoreService.java

@@ -5,6 +5,7 @@ import cn.lili.modules.member.entity.dto.CollectionDTO;
 import cn.lili.modules.store.entity.dos.Store;
 import cn.lili.modules.store.entity.dto.*;
 import cn.lili.modules.store.entity.vos.StoreSearchParams;
+import cn.lili.modules.store.entity.vos.StoreSettingVO;
 import cn.lili.modules.store.entity.vos.StoreVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -27,6 +28,13 @@ public interface StoreService extends IService<Store> {
     IPage<StoreVO> findByConditionPage(StoreSearchParams entity, PageVO page);
 
     /**
+     * 获取当前登录店铺设置信息
+     *
+     * @return 店铺信息DO
+     */
+    StoreSettingVO getStoreSetting();
+
+    /**
      * 获取当前登录店铺信息
      *
      * @return 店铺信息DO

framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java

@@ -12,6 +12,7 @@ import cn.lili.modules.goods.service.CategoryService;
 import cn.lili.modules.goods.service.GoodsService;
 import cn.lili.modules.search.utils.EsIndexUtil;
 import cn.lili.modules.store.entity.dos.Store;
+import cn.lili.modules.store.entity.dos.StoreCustoms;
 import cn.lili.modules.store.entity.dos.StoreDetail;
 import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
 import cn.lili.modules.store.entity.dto.StoreSettingDTO;
@@ -20,6 +21,7 @@ import cn.lili.modules.store.entity.vos.StoreBasicInfoVO;
 import cn.lili.modules.store.entity.vos.StoreDetailVO;
 import cn.lili.modules.store.entity.vos.StoreManagementCategoryVO;
 import cn.lili.modules.store.entity.vos.StoreOtherVO;
+import cn.lili.modules.store.mapper.StoreCustomsMapper;
 import cn.lili.modules.store.mapper.StoreDetailMapper;
 import cn.lili.modules.store.service.StoreDetailService;
 import cn.lili.modules.store.service.StoreService;
@@ -64,6 +66,9 @@ public class StoreDetailServiceImpl extends ServiceImpl<StoreDetailMapper, Store
     @Autowired
     private RocketMQTemplate rocketMQTemplate;
 
+    @Autowired
+    private StoreCustomsMapper storeCustomsMapper;
+
     @Override
     public StoreDetailVO getStoreDetailVO(String storeId) {
         return this.baseMapper.getStoreDetail(storeId);
@@ -138,6 +143,16 @@ public class StoreDetailServiceImpl extends ServiceImpl<StoreDetailMapper, Store
     }
 
     @Override
+    public Boolean editStoreCustoms(StoreCustoms customs) {
+        if (storeCustomsMapper.exists(new LambdaQueryWrapper<StoreCustoms>().eq(StoreCustoms::getId, customs.getId()))){
+            storeCustomsMapper.updateById(customs);
+        }else {
+            storeCustomsMapper.insert(customs);
+        }
+        return true;
+    }
+
+    @Override
     public StoreBasicInfoVO getStoreBasicInfoDTO(String storeId) {
         return this.baseMapper.getStoreBasicInfoDTO(storeId);
     }

framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java

@@ -17,6 +17,7 @@ import cn.lili.modules.store.entity.dos.StoreDetail;
 import cn.lili.modules.store.entity.dto.*;
 import cn.lili.modules.store.entity.enums.StoreStatusEnum;
 import cn.lili.modules.store.entity.vos.StoreSearchParams;
+import cn.lili.modules.store.entity.vos.StoreSettingVO;
 import cn.lili.modules.store.entity.vos.StoreVO;
 import cn.lili.modules.store.mapper.StoreMapper;
 import cn.lili.modules.store.service.StoreDetailService;
@@ -66,6 +67,14 @@ public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements
     }
 
     @Override
+    public StoreSettingVO getStoreSetting() {
+        AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
+        StoreSettingVO storeVO = this.baseMapper.getStoreSetting(currentUser.getStoreId());
+        storeVO.setNickName(currentUser.getNickName());
+        return storeVO;
+    }
+
+    @Override
     public StoreVO getStoreDetail() {
         AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
         StoreVO storeVO = this.baseMapper.getStoreDetail(currentUser.getStoreId());

seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java

@@ -181,6 +181,14 @@ public class OrderStoreController {
         return ResultUtil.data(orderService.customsPush(orderSn)? "推送成功" : "推送失败");
     }
 
+    @ApiOperation(value = "订单更新合同号")
+    @PutMapping(path = "/contractNo/{orderSn}/{contractNo}")
+    public ResultMessage<Object> updateCon(@NotBlank(message = "订单编号不能为空") @PathVariable String orderSn,
+                                           @NotBlank(message = "订单编号不能为空") @PathVariable String contractNo) {
+        orderService.updateContractNo(orderSn, contractNo);
+        return ResultUtil.data(ResultCode.SUCCESS.message());
+    }
+
     @ApiOperation(value = "报关回调接口")
     @PostMapping(path = "/customs/callback")
     public ResultMessage<Object> customsCallback(String signMsg, String content, String msgType, String copMsgId) {

seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java

@@ -3,8 +3,10 @@ package cn.lili.controller.settings;
 
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.store.entity.dos.StoreCustoms;
 import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
 import cn.lili.modules.store.entity.dto.StoreSettingDTO;
+import cn.lili.modules.store.entity.vos.StoreSettingVO;
 import cn.lili.modules.store.entity.vos.StoreVO;
 import cn.lili.modules.store.service.StoreDetailService;
 import cn.lili.modules.store.service.StoreService;
@@ -43,9 +45,17 @@ public class StoreSettingsController {
 
     @ApiOperation(value = "获取商家设置")
     @GetMapping
-    public ResultMessage<StoreVO> get() {
+    public ResultMessage<?> get() {
         //获取当前登录商家内容
-        return ResultUtil.data(storeService.getStoreDetail());
+        return ResultUtil.data(storeService.getStoreSetting());
+    }
+
+    @ApiOperation(value = "修改商家海关凭证")
+    @PutMapping("/customs")
+    public ResultMessage<Object> edit(StoreCustoms customs) {
+        //修改商家海关凭证
+        Boolean result = storeDetailService.editStoreCustoms(customs);
+        return ResultUtil.data(result);
     }
 
     @ApiOperation(value = "修改商家设置")