增加商户密钥，销售明细使用商户密钥配置表md5签名验签。

eccs-admin/build.gradle

@@ -8,6 +8,7 @@ apply plugin: 'war'
 dependencies {
     implementation project(':eccs-common'),
             project(':eccs-framework'),
+            project(':eccs-generator'),
             project(':eccs-quartz'),
             project(':eccs-system'),
             project(':eccs-biz')

eccs-biz/src/main/java/com/emato/biz/controller/BizDemoController.java

@@ -25,7 +25,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 演示业务开发Controller
  * 
- * @author yangbo
+ * @author scott
  * @date 2021-01-06
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/cus/EmsClassConfigController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 账册分类配置Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/mall/MallInveMngController.java

@@ -24,7 +24,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 库存管理，wms入库回传时，增加库存数Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/mall/MallMngChangeController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 电商库存变化记录表Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/mall/MallShopInveMngController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 商户店面库存，包括跨境，一般贸易Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/mall/MallStoreMngChangeController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 电商门店库存变化记录表Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/merchant/MerchantBaseController.java

@@ -24,7 +24,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 商户基本信息Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/merchant/MerchantSecretController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.merchant;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.merchant.MerchantSecret;
+import com.emato.biz.service.merchant.IMerchantSecretService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 商户密钥Controller
+ * 
+ * @author scott
+ * @date 2023-03-17
+ */
+@RestController
+@RequestMapping("/merchant/secret")
+public class MerchantSecretController extends BaseController
+{
+    @Autowired
+    private IMerchantSecretService merchantSecretService;
+
+    /**
+     * 查询商户密钥列表
+     */
+    @PreAuthorize("@ss.hasPermi('merchant:secret:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(MerchantSecret merchantSecret)
+    {
+        startPage();
+        List<MerchantSecret> list = merchantSecretService.selectMerchantSecretList(merchantSecret);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出商户密钥列表
+     */
+    @PreAuthorize("@ss.hasPermi('merchant:secret:export')")
+    @Log(title = "商户密钥", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(MerchantSecret merchantSecret)
+    {
+        List<MerchantSecret> list = merchantSecretService.selectMerchantSecretList(merchantSecret);
+        ExcelUtil<MerchantSecret> util = new ExcelUtil<MerchantSecret>(MerchantSecret.class);
+        return util.exportExcel(list, "secret");
+    }
+
+    /**
+     * 获取商户密钥详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('merchant:secret:query')")
+    @GetMapping(value = "/{secSn}")
+    public AjaxResult getInfo(@PathVariable("secSn") String secSn)
+    {
+        return AjaxResult.success(merchantSecretService.selectMerchantSecretById(secSn));
+    }
+
+    /**
+     * 新增商户密钥
+     */
+    @PreAuthorize("@ss.hasPermi('merchant:secret:add')")
+    @Log(title = "商户密钥", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MerchantSecret merchantSecret)
+    {
+        return toAjax(merchantSecretService.insertMerchantSecret(merchantSecret));
+    }
+
+    /**
+     * 修改商户密钥
+     */
+    @PreAuthorize("@ss.hasPermi('merchant:secret:edit')")
+    @Log(title = "商户密钥", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MerchantSecret merchantSecret)
+    {
+        return toAjax(merchantSecretService.updateMerchantSecret(merchantSecret));
+    }
+
+    /**
+     * 删除商户密钥
+     */
+    @PreAuthorize("@ss.hasPermi('merchant:secret:remove')")
+    @Log(title = "商户密钥", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{secSns}")
+    public AjaxResult remove(@PathVariable String[] secSns)
+    {
+        return toAjax(merchantSecretService.deleteMerchantSecretByIds(secSns));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/merchant/ThirdMerchantBizController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 第三方商户信息Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-02
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/store/MallStoreController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 商户门店Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-04
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWareAdjustmentOrderController.java

@@ -31,7 +31,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 库存内调结转出入库记录Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWareAdjustmentOrderItemController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 库存内调结转出入库明细Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveFreezeController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 库存冻结记录，记录订单商品冻结Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveMngAdjustController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 库存调整记录.Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveMngController.java

@@ -31,7 +31,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 库存管理，wms入库回传时，增加库存数Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveReceiptController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 库存入库记录，记录货物入库Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveReceiptGoodsController.java

@@ -31,7 +31,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 库存入库货品，发WMS货品数据Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveRecordController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 库存操作记录Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveShipmentController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveShipmentGoodsController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 库存发货货品Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveWithdrawController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 库存退港Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveWithdrawItemController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 库存退港明细Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbMerchShopInController.java

@@ -31,7 +31,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 商户门店进场记录，全部类型门店Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbMerchShopInveController.java

@@ -31,7 +31,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 商户店面库存，包括跨境，一般贸易Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbMerchShopInveRecordController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 门店库存操作记录Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbMerchShopMoveRecordController.java

@@ -31,7 +31,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 商户门店转移记录Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbMerchShopOrderMinusController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 跨境商户门店展示减扣记录，保税展示模式，走统一版清关Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbMerchShopOutController.java

@@ -31,7 +31,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 商户门店出场记录，全部类型门店（WMS回调后写入）Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbShopBaseController.java

@@ -23,7 +23,7 @@ import com.emato.common.core.page.TableDataInfo;
 /**
  * 商户门店基本信息Controller
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 @RestController

eccs-biz/src/main/java/com/emato/biz/domain/BizDemo.java

@@ -8,7 +8,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 演示业务开发对象 biz_demo
  * 
- * @author yangbo
+ * @author scott
  * @date 2021-01-06
  */
 public class BizDemo extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/cus/EmsClassConfig.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 账册分类配置对象 ems_class_config
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class EmsClassConfig extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/mall/MallInveMng.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 库存管理，wms入库回传时，增加库存数对象 mall_inve_mng
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class MallInveMng extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/mall/MallMngChange.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 电商库存变化记录表对象 mall_mng_change
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class MallMngChange extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/mall/MallShopInveMng.java

@@ -11,7 +11,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 商户店面库存，包括跨境，一般贸易对象 mall_shop_inve_mng
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class MallShopInveMng extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/mall/MallStoreMngChange.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 电商门店库存变化记录表对象 mall_store_mng_change
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class MallStoreMngChange extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/merchant/MerchantBase.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 商户基本信息对象 merchant_base
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class MerchantBase extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/merchant/MerchantSecret.java

@@ -0,0 +1,208 @@
+package com.emato.biz.domain.merchant;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 商户密钥对象 merchant_secret
+ * 
+ * @author scott
+ * @date 2023-03-17
+ */
+public class MerchantSecret extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 密钥编号 */
+    private String secSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户密钥类型 */
+    @Excel(name = "商户密钥类型")
+    private String merchSecType;
+
+    /** MD5混淆码 */
+    @Excel(name = "MD5混淆码")
+    private String md5Salt;
+
+    /** 商户公钥 */
+    @Excel(name = "商户公钥")
+    private String merchPubKey;
+
+    /** 商户私钥 */
+    @Excel(name = "商户私钥")
+    private String merchPriKey;
+
+    /** e码头公钥 */
+    @Excel(name = "e码头公钥")
+    private String ematoPubKey;
+
+    /** e码头私钥 */
+    @Excel(name = "e码头私钥")
+    private String ematoPriKey;
+
+    /** 是否有效 */
+    @Excel(name = "是否有效")
+    private String isValid;
+
+    /** 创建人序号 */
+    @Excel(name = "创建人序号")
+    private String createrSn;
+
+    /** 修改人序号 */
+    @Excel(name = "修改人序号")
+    private String moderSn;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setSecSn(String secSn) 
+    {
+        this.secSn = secSn;
+    }
+
+    public String getSecSn() 
+    {
+        return secSn;
+    }
+    public void setMerchSn(String merchSn) 
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn() 
+    {
+        return merchSn;
+    }
+    public void setMerchSecType(String merchSecType) 
+    {
+        this.merchSecType = merchSecType;
+    }
+
+    public String getMerchSecType() 
+    {
+        return merchSecType;
+    }
+    public void setMd5Salt(String md5Salt) 
+    {
+        this.md5Salt = md5Salt;
+    }
+
+    public String getMd5Salt() 
+    {
+        return md5Salt;
+    }
+    public void setMerchPubKey(String merchPubKey) 
+    {
+        this.merchPubKey = merchPubKey;
+    }
+
+    public String getMerchPubKey() 
+    {
+        return merchPubKey;
+    }
+    public void setMerchPriKey(String merchPriKey) 
+    {
+        this.merchPriKey = merchPriKey;
+    }
+
+    public String getMerchPriKey() 
+    {
+        return merchPriKey;
+    }
+    public void setEmatoPubKey(String ematoPubKey) 
+    {
+        this.ematoPubKey = ematoPubKey;
+    }
+
+    public String getEmatoPubKey() 
+    {
+        return ematoPubKey;
+    }
+    public void setEmatoPriKey(String ematoPriKey) 
+    {
+        this.ematoPriKey = ematoPriKey;
+    }
+
+    public String getEmatoPriKey() 
+    {
+        return ematoPriKey;
+    }
+    public void setIsValid(String isValid) 
+    {
+        this.isValid = isValid;
+    }
+
+    public String getIsValid() 
+    {
+        return isValid;
+    }
+    public void setCreaterSn(String createrSn) 
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn() 
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn) 
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn() 
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime) 
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime() 
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm) 
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm() 
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("secSn", getSecSn())
+            .append("merchSn", getMerchSn())
+            .append("merchSecType", getMerchSecType())
+            .append("md5Salt", getMd5Salt())
+            .append("merchPubKey", getMerchPubKey())
+            .append("merchPriKey", getMerchPriKey())
+            .append("ematoPubKey", getEmatoPubKey())
+            .append("ematoPriKey", getEmatoPriKey())
+            .append("isValid", getIsValid())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/merchant/ThirdMerchantBiz.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 第三方商户信息对象 third_merchant_biz
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-02
  */
 public class ThirdMerchantBiz extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/store/MallStore.java

@@ -11,7 +11,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 商户门店对象 mall_store
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-04
  */
 public class MallStore extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWareAdjustmentOrder.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 库存内调结转出入库记录对象 o_ware_adjustment_order
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWareAdjustmentOrder extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWareAdjustmentOrderItem.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 库存内调结转出入库明细对象 o_ware_adjustment_order_item
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWareAdjustmentOrderItem extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveFreeze.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 库存冻结记录，记录订单商品冻结对象 o_wb_inve_freeze
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbInveFreeze extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveMng.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 库存管理，wms入库回传时，增加库存数对象 o_wb_inve_mng
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbInveMng extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveMngAdjust.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 库存调整记录.对象 o_wb_inve_mng_adjust
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbInveMngAdjust extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveReceipt.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 库存入库记录，记录货物入库对象 o_wb_inve_receipt
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbInveReceipt extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveReceiptGoods.java

@@ -11,7 +11,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 库存入库货品，发WMS货品数据对象 o_wb_inve_receipt_goods
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbInveReceiptGoods extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveRecord.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 库存操作记录对象 o_wb_inve_record
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbInveRecord extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveShipment.java

@@ -11,7 +11,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)对象 o_wb_inve_shipment
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbInveShipment extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveShipmentGoods.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 库存发货货品对象 o_wb_inve_shipment_goods
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbInveShipmentGoods extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveWithdraw.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 库存退港对象 o_wb_inve_withdraw
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbInveWithdraw extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveWithdrawItem.java

@@ -11,7 +11,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 库存退港明细对象 o_wb_inve_withdraw_item
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbInveWithdrawItem extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbMerchShopIn.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 商户门店进场记录，全部类型门店对象 o_wb_merch_shop_in
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbMerchShopIn extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbMerchShopInve.java

@@ -11,7 +11,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 商户店面库存，包括跨境，一般贸易对象 o_wb_merch_shop_inve
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbMerchShopInve extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbMerchShopInveRecord.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 门店库存操作记录对象 o_wb_merch_shop_inve_record
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbMerchShopInveRecord extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbMerchShopMoveRecord.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 商户门店转移记录对象 o_wb_merch_shop_move_record
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbMerchShopMoveRecord extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbMerchShopOrderMinus.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 跨境商户门店展示减扣记录，保税展示模式，走统一版清关对象 o_wb_merch_shop_order_minus
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbMerchShopOrderMinus extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbMerchShopOut.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 商户门店出场记录，全部类型门店（WMS回调后写入）对象 o_wb_merch_shop_out
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbMerchShopOut extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbShopBase.java

@@ -10,7 +10,7 @@ import com.emato.common.core.domain.BaseEntity;
 /**
  * 商户门店基本信息对象 o_wb_shop_base
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public class OWbShopBase extends BaseEntity

eccs-biz/src/main/java/com/emato/biz/mapper/BizDemoMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.BizDemo;
 /**
  * 演示业务开发Mapper接口
  * 
- * @author yangbo
+ * @author scott
  * @date 2021-01-06
  */
 public interface BizDemoMapper 

eccs-biz/src/main/java/com/emato/biz/mapper/cus/EmsClassConfigMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.cus.EmsClassConfig;
 /**
  * 账册分类配置Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface EmsClassConfigMapper

eccs-biz/src/main/java/com/emato/biz/mapper/mall/MallInveMngMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.mall.MallInveMng;
 /**
  * 库存管理，wms入库回传时，增加库存数Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface MallInveMngMapper

eccs-biz/src/main/java/com/emato/biz/mapper/mall/MallMngChangeMapper.java

@@ -10,7 +10,7 @@ import com.emato.biz.domain.mall.NewSystemFormatEntiy;
 /**
  * 电商库存变化记录表Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface MallMngChangeMapper

eccs-biz/src/main/java/com/emato/biz/mapper/mall/MallShopInveMngMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.mall.MallShopInveMng;
 /**
  * 商户店面库存，包括跨境，一般贸易Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface MallShopInveMngMapper

eccs-biz/src/main/java/com/emato/biz/mapper/mall/MallStoreMngChangeMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.mall.MallStoreMngChange;
 /**
  * 电商门店库存变化记录表Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface MallStoreMngChangeMapper

eccs-biz/src/main/java/com/emato/biz/mapper/merchant/MerchantBaseMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.merchant.MerchantBase;
 /**
  * 商户基本信息Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface MerchantBaseMapper

eccs-biz/src/main/java/com/emato/biz/mapper/merchant/MerchantSecretMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.merchant;
+
+import java.util.List;
+import com.emato.biz.domain.merchant.MerchantSecret;
+
+/**
+ * 商户密钥Mapper接口
+ * 
+ * @author scott
+ * @date 2023-03-17
+ */
+public interface MerchantSecretMapper 
+{
+    /**
+     * 查询商户密钥
+     * 
+     * @param secSn 商户密钥ID
+     * @return 商户密钥
+     */
+    public MerchantSecret selectMerchantSecretById(String secSn);
+
+    /**
+     * 查询商户密钥列表
+     * 
+     * @param merchantSecret 商户密钥
+     * @return 商户密钥集合
+     */
+    public List<MerchantSecret> selectMerchantSecretList(MerchantSecret merchantSecret);
+
+    /**
+     * 新增商户密钥
+     * 
+     * @param merchantSecret 商户密钥
+     * @return 结果
+     */
+    public int insertMerchantSecret(MerchantSecret merchantSecret);
+
+    /**
+     * 修改商户密钥
+     * 
+     * @param merchantSecret 商户密钥
+     * @return 结果
+     */
+    public int updateMerchantSecret(MerchantSecret merchantSecret);
+
+    /**
+     * 删除商户密钥
+     * 
+     * @param secSn 商户密钥ID
+     * @return 结果
+     */
+    public int deleteMerchantSecretById(String secSn);
+
+    /**
+     * 批量删除商户密钥
+     * 
+     * @param secSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteMerchantSecretByIds(String[] secSns);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/merchant/ThirdMerchantBizMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.merchant.ThirdMerchantBiz;
 /**
  * 第三方商户信息Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-02
  */
 public interface ThirdMerchantBizMapper

eccs-biz/src/main/java/com/emato/biz/mapper/store/MallStoreMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.store.MallStore;
 /**
  * 商户门店Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-04
  */
 public interface MallStoreMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWareAdjustmentOrderItemMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWareAdjustmentOrderItem;
 /**
  * 库存内调结转出入库明细Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWareAdjustmentOrderItemMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWareAdjustmentOrderMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWareAdjustmentOrder;
 /**
  * 库存内调结转出入库记录Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWareAdjustmentOrderMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveFreezeMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbInveFreeze;
 /**
  * 库存冻结记录，记录订单商品冻结Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbInveFreezeMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveMngAdjustMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbInveMngAdjust;
 /**
  * 库存调整记录.Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbInveMngAdjustMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveMngMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbInveMng;
 /**
  * 库存管理，wms入库回传时，增加库存数Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbInveMngMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveReceiptGoodsMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbInveReceiptGoods;
 /**
  * 库存入库货品，发WMS货品数据Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbInveReceiptGoodsMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveReceiptMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbInveReceipt;
 /**
  * 库存入库记录，记录货物入库Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbInveReceiptMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveRecordMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbInveRecord;
 /**
  * 库存操作记录Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbInveRecordMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveShipmentGoodsMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbInveShipmentGoods;
 /**
  * 库存发货货品Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbInveShipmentGoodsMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveShipmentMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbInveShipment;
 /**
  * 库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbInveShipmentMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveWithdrawItemMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbInveWithdrawItem;
 /**
  * 库存退港明细Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbInveWithdrawItemMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveWithdrawMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbInveWithdraw;
 /**
  * 库存退港Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbInveWithdrawMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbMerchShopInMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbMerchShopIn;
 /**
  * 商户门店进场记录，全部类型门店Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbMerchShopInMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbMerchShopInveMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbMerchShopInve;
 /**
  * 商户店面库存，包括跨境，一般贸易Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbMerchShopInveMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbMerchShopInveRecordMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbMerchShopInveRecord;
 /**
  * 门店库存操作记录Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbMerchShopInveRecordMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbMerchShopMoveRecordMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbMerchShopMoveRecord;
 /**
  * 商户门店转移记录Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbMerchShopMoveRecordMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbMerchShopOrderMinusMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbMerchShopOrderMinus;
 /**
  * 跨境商户门店展示减扣记录，保税展示模式，走统一版清关Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbMerchShopOrderMinusMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbMerchShopOutMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbMerchShopOut;
 /**
  * 商户门店出场记录，全部类型门店（WMS回调后写入）Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbMerchShopOutMapper

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbShopBaseMapper.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.warehouse.OWbShopBase;
 /**
  * 商户门店基本信息Mapper接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface OWbShopBaseMapper

eccs-biz/src/main/java/com/emato/biz/service/IBizDemoService.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.BizDemo;
 /**
  * 演示业务开发Service接口
  * 
- * @author yangbo
+ * @author scott
  * @date 2021-01-06
  */
 public interface IBizDemoService 

eccs-biz/src/main/java/com/emato/biz/service/cus/IEmsClassConfigService.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.cus.EmsClassConfig;
 /**
  * 账册分类配置Service接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface IEmsClassConfigService

eccs-biz/src/main/java/com/emato/biz/service/impl/MerchantSecretServiceImpl.java

@@ -0,0 +1,95 @@
+package com.emato.biz.service.impl;
+
+import java.util.List;
+import com.emato.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.emato.biz.mapper.merchant.MerchantSecretMapper;
+import com.emato.biz.domain.merchant.MerchantSecret;
+import com.emato.biz.service.merchant.IMerchantSecretService;
+
+/**
+ * 商户密钥Service业务层处理
+ * 
+ * @author scott
+ * @date 2023-03-17
+ */
+@Service
+public class MerchantSecretServiceImpl implements IMerchantSecretService 
+{
+    @Autowired
+    private MerchantSecretMapper merchantSecretMapper;
+
+    /**
+     * 查询商户密钥
+     * 
+     * @param secSn 商户密钥ID
+     * @return 商户密钥
+     */
+    @Override
+    public MerchantSecret selectMerchantSecretById(String secSn)
+    {
+        return merchantSecretMapper.selectMerchantSecretById(secSn);
+    }
+
+    /**
+     * 查询商户密钥列表
+     * 
+     * @param merchantSecret 商户密钥
+     * @return 商户密钥
+     */
+    @Override
+    public List<MerchantSecret> selectMerchantSecretList(MerchantSecret merchantSecret)
+    {
+        return merchantSecretMapper.selectMerchantSecretList(merchantSecret);
+    }
+
+    /**
+     * 新增商户密钥
+     * 
+     * @param merchantSecret 商户密钥
+     * @return 结果
+     */
+    @Override
+    public int insertMerchantSecret(MerchantSecret merchantSecret)
+    {
+        merchantSecret.setCreateTime(DateUtils.getNowDate());
+        return merchantSecretMapper.insertMerchantSecret(merchantSecret);
+    }
+
+    /**
+     * 修改商户密钥
+     * 
+     * @param merchantSecret 商户密钥
+     * @return 结果
+     */
+    @Override
+    public int updateMerchantSecret(MerchantSecret merchantSecret)
+    {
+        return merchantSecretMapper.updateMerchantSecret(merchantSecret);
+    }
+
+    /**
+     * 批量删除商户密钥
+     * 
+     * @param secSns 需要删除的商户密钥ID
+     * @return 结果
+     */
+    @Override
+    public int deleteMerchantSecretByIds(String[] secSns)
+    {
+        return merchantSecretMapper.deleteMerchantSecretByIds(secSns);
+    }
+
+    /**
+     * 删除商户密钥信息
+     * 
+     * @param secSn 商户密钥ID
+     * @return 结果
+     */
+    @Override
+    public int deleteMerchantSecretById(String secSn)
+    {
+        return merchantSecretMapper.deleteMerchantSecretById(secSn);
+    }
+}

eccs-biz/src/main/java/com/emato/biz/service/impl/SalesDetaiServicelImpl.java

@@ -6,11 +6,14 @@ import com.emato.biz.domain.OmsUtils;
 import com.emato.biz.domain.mall.InventoryDataPushVo;
 import com.emato.biz.domain.mall.InventoryDataVo;
 import com.emato.biz.domain.mall.NewSystemFormatEntiy;
+import com.emato.biz.domain.merchant.MerchantSecret;
 import com.emato.biz.mapper.mall.InventoryDataMapper;
 import com.emato.biz.mapper.mall.MallMngChangeMapper;
+import com.emato.biz.mapper.merchant.MerchantSecretMapper;
 import com.emato.biz.service.mall.ISalesDetaiServicel;
 import com.emato.common.core.Result;
 import com.emato.common.utils.DateUtils;
+import com.emato.common.utils.StringUtils;
 import com.emato.common.utils.sign.Md5Utils;
 import com.emato.system.mapper.SysConfigMapper;
 import org.slf4j.Logger;
@@ -42,6 +45,8 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
     @Autowired
     private SysConfigMapper configMapper;
     @Autowired
+    private MerchantSecretMapper merchantSecretMapper;
+    @Autowired
     private OmsUtils omsUtils;
 
     /**
@@ -69,13 +74,33 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
             String strSign = weChatMapSalesMsg.get("sign").toString().trim();
             String merchId = weChatMapSalesMsg.get("merchId").toString().trim()==null?"":weChatMapSalesMsg.get("merchId").toString().trim();
             String timestamp = weChatMapSalesMsg.get("timestamp").toString().trim()==null?"":weChatMapSalesMsg.get("timestamp").toString().trim();
-            String str = configMapper.getConfigValue("salesdetai").trim();;
-            if(timestamp.equals("")||merchId.equals("")){
-                return Result.error("900051","参数错误");
+
+            // String str = configMapper.getConfigValue("salesdetai").trim();
+
+            if(StringUtils.isEmpty(merchId)){
+                return Result.error("900051","merchId为空");
+            }
+
+            // 改为使用密钥配置
+            MerchantSecret merchantSecret = new MerchantSecret();
+            merchantSecret.setMerchSn(merchId);
+
+            List<MerchantSecret> merchantSecrets = merchantSecretMapper.selectMerchantSecretList(merchantSecret);
+            if (null == merchantSecrets || merchantSecrets.isEmpty()) {
+                return Result.error("900051","merchId参数错误");
             }
-            if(!strSign.trim().equals(checkType(weChatMapSalesMsg.get("data").toString(),timestamp,str))){
-                return Result.error("900052","签名错误");
+
+            MerchantSecret MerchantSecret_2 = merchantSecrets.get(0);
+            String str = MerchantSecret_2.getMd5Salt();
+
+            if(StringUtils.isEmpty(timestamp)){
+                return Result.error("900051","timestamp为空");
+            }
+
+            if (!strSign.trim().equals(checkType(weChatMapSalesMsg.get("data").toString(), timestamp, str))) {
+                return Result.error("900052", "签名错误");
             }
+
             Map<String, Object> weSalesMsg =  JSONObject.toJavaObject(JSON.parseObject(weChatMapSalesMsg.get("data").toString()), Map.class);
 
             String starTime = (String) weSalesMsg.get("starTime");
@@ -168,13 +193,35 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
             String strSign = weChatMapMsg.get("sign").toString().trim();
             String merchId = weChatMapMsg.get("merchId").toString().trim()==null?"":weChatMapMsg.get("merchId").toString().trim();
             String timestamp = weChatMapMsg.get("timestamp").toString().trim()==null?"":weChatMapMsg.get("timestamp").toString().trim();
-            String str = configMapper.getConfigValue("inventory");;
-            if(timestamp.equals("")||merchId.equals("")){
-                return Result.error("900001","参数错误");
+
+
+            // String str = configMapper.getConfigValue("inventory");
+
+            if(StringUtils.isEmpty(merchId)){
+                return Result.error("900051","merchId为空");
+            }
+
+            // 改为使用密钥配置
+            MerchantSecret merchantSecret = new MerchantSecret();
+            merchantSecret.setMerchSn(merchId);
+
+            List<MerchantSecret> merchantSecrets = merchantSecretMapper.selectMerchantSecretList(merchantSecret);
+            if (null == merchantSecrets || merchantSecrets.isEmpty()) {
+                return Result.error("900051","merchId参数错误");
             }
-            if(!strSign.trim().equals(checkType(weChatMapMsg.get("data").toString(),timestamp,str))){
-                return Result.error("900002","签名错误");
+
+            MerchantSecret MerchantSecret_2 = merchantSecrets.get(0);
+            String str = MerchantSecret_2.getMd5Salt();
+
+            if(StringUtils.isEmpty(timestamp)){
+                return Result.error("900051","timestamp为空");
+            }
+
+
+            if (!strSign.trim().equals(checkType(weChatMapMsg.get("data").toString(), timestamp, str))) {
+                return Result.error("900002", "签名错误");
             }
+
             Map<String, Object> weDtilMsg =  JSONObject.toJavaObject(JSON.parseObject(weChatMapMsg.get("data").toString()), Map.class);
             Integer pageIndex = Integer.parseInt(weDtilMsg.get("pageIndex")+"");
             Integer pageSize = Integer.parseInt(weDtilMsg.get("pageSize")+"");

eccs-biz/src/main/java/com/emato/biz/service/mall/IMallInveMngService.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.mall.MallInveMng;
 /**
  * 库存管理，wms入库回传时，增加库存数Service接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface IMallInveMngService

eccs-biz/src/main/java/com/emato/biz/service/mall/IMallMngChangeService.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.mall.MallMngChange;
 /**
  * 电商库存变化记录表Service接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface IMallMngChangeService

eccs-biz/src/main/java/com/emato/biz/service/mall/IMallShopInveMngService.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.mall.MallShopInveMng;
 /**
  * 商户店面库存，包括跨境，一般贸易Service接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface IMallShopInveMngService

eccs-biz/src/main/java/com/emato/biz/service/mall/IMallStoreMngChangeService.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.mall.MallStoreMngChange;
 /**
  * 电商门店库存变化记录表Service接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface IMallStoreMngChangeService

eccs-biz/src/main/java/com/emato/biz/service/merchant/IMerchantBaseService.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.merchant.MerchantBase;
 /**
  * 商户基本信息Service接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-01
  */
 public interface IMerchantBaseService

eccs-biz/src/main/java/com/emato/biz/service/merchant/IMerchantSecretService.java

@@ -0,0 +1,61 @@
+package com.emato.biz.service.merchant;
+
+import java.util.List;
+import com.emato.biz.domain.merchant.MerchantSecret;
+
+/**
+ * 商户密钥Service接口
+ * 
+ * @author scott
+ * @date 2023-03-17
+ */
+public interface IMerchantSecretService 
+{
+    /**
+     * 查询商户密钥
+     * 
+     * @param secSn 商户密钥ID
+     * @return 商户密钥
+     */
+    public MerchantSecret selectMerchantSecretById(String secSn);
+
+    /**
+     * 查询商户密钥列表
+     * 
+     * @param merchantSecret 商户密钥
+     * @return 商户密钥集合
+     */
+    public List<MerchantSecret> selectMerchantSecretList(MerchantSecret merchantSecret);
+
+    /**
+     * 新增商户密钥
+     * 
+     * @param merchantSecret 商户密钥
+     * @return 结果
+     */
+    public int insertMerchantSecret(MerchantSecret merchantSecret);
+
+    /**
+     * 修改商户密钥
+     * 
+     * @param merchantSecret 商户密钥
+     * @return 结果
+     */
+    public int updateMerchantSecret(MerchantSecret merchantSecret);
+
+    /**
+     * 批量删除商户密钥
+     * 
+     * @param secSns 需要删除的商户密钥ID
+     * @return 结果
+     */
+    public int deleteMerchantSecretByIds(String[] secSns);
+
+    /**
+     * 删除商户密钥信息
+     * 
+     * @param secSn 商户密钥ID
+     * @return 结果
+     */
+    public int deleteMerchantSecretById(String secSn);
+}

eccs-biz/src/main/java/com/emato/biz/service/merchant/IThirdMerchantBizService.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.merchant.ThirdMerchantBiz;
 /**
  * 第三方商户信息Service接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-02
  */
 public interface IThirdMerchantBizService

eccs-biz/src/main/java/com/emato/biz/service/store/IMallStoreService.java

@@ -6,7 +6,7 @@ import com.emato.biz.domain.store.MallStore;
 /**
  * 商户门店Service接口
  *
- * @author yangbo
+ * @author scott
  * @date 2021-02-04
  */
 public interface IMallStoreService