修改目录结构

src/main/java/com/emato/cuspay/CuspaySpringBootApplication.java

@@ -7,10 +7,12 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication(
         exclude ={
+                // 不使用数据源自动配置, 多数据源
                 DataSourceAutoConfiguration.class
         },scanBasePackages = {
         "com.emato.cuspay"
-    }
+}
+
 )
 @EnableScheduling
 public class CuspaySpringBootApplication {

src/main/java/com/emato/cuspay/dao/mapper/merch/MerchCusCfgMapper.java

@@ -1,7 +1,7 @@
 package com.emato.cuspay.dao.mapper.merch;
 
 
-import com.emato.cuspay.dto.merch.MerchCusCfg;
+import com.emato.cuspay.entity.merch.MerchCusCfg;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

src/main/java/com/emato/cuspay/dao/mapper/merch/MerchNotiMapper.java

@@ -1,7 +1,7 @@
 package com.emato.cuspay.dao.mapper.merch;
 
 
-import com.emato.cuspay.dto.merch.MerchNoti;
+import com.emato.cuspay.entity.merch.MerchNoti;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

src/main/java/com/emato/cuspay/dao/mapper/merch/MerchPayCfgMapper.java

@@ -1,8 +1,9 @@
 package com.emato.cuspay.dao.mapper.merch;
 
 
-import com.emato.cuspay.dto.merch.MerchPayCfg;
+import com.emato.cuspay.entity.merch.MerchPayCfg;
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 

src/main/java/com/emato/cuspay/dao/mapper/wx/WxCbPayDocMapper.java

@@ -1,11 +1,8 @@
 package com.emato.cuspay.dao.mapper.wx;
 
-
-
-
-
-import com.emato.cuspay.wx.dao.entity.WxCbPayDoc;
+import com.emato.cuspay.wx.entity.WxCbPayDoc;
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 

src/main/java/com/emato/cuspay/dao/mapper/wx/WxPayErrorMapper.java

@@ -1,8 +1,6 @@
 package com.emato.cuspay.dao.mapper.wx;
 
-
-
-import com.emato.cuspay.wx.dao.entity.WxPayError;
+import com.emato.cuspay.wx.entity.WxPayError;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

src/main/java/com/emato/cuspay/dto/merch/MerchCusCfg.java → src/main/java/com/emato/cuspay/entity/merch/MerchCusCfg.java

@@ -1,4 +1,4 @@
-package com.emato.cuspay.dto.merch;
+package com.emato.cuspay.entity.merch;
 
 import java.io.Serializable;
 import java.util.Date;

src/main/java/com/emato/cuspay/dto/merch/MerchNoti.java → src/main/java/com/emato/cuspay/entity/merch/MerchNoti.java

@@ -1,4 +1,4 @@
-package com.emato.cuspay.dto.merch;
+package com.emato.cuspay.entity.merch;
 
 import java.io.Serializable;
 import java.util.Date;

src/main/java/com/emato/cuspay/dto/merch/MerchPayCfg.java → src/main/java/com/emato/cuspay/entity/merch/MerchPayCfg.java

@@ -1,4 +1,4 @@
-package com.emato.cuspay.dto.merch;
+package com.emato.cuspay.entity.merch;
 
 import java.io.Serializable;
 import java.util.Date;

src/main/java/com/emato/cuspay/manager/redis/jedis/cluster/config/JedisClusterProperties.java

@@ -3,7 +3,6 @@ package com.emato.cuspay.manager.redis.jedis.cluster.config;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import redis.clients.jedis.HostAndPort;
 
 import java.io.Serializable;
 import java.util.*;

src/main/java/com/emato/cuspay/notify/CusMerchantNotice.java

@@ -2,7 +2,7 @@ package com.emato.cuspay.notify;
 
 import com.emato.cuspay.common.contant.MerchNoticeDict;
 import com.emato.cuspay.dao.mapper.merch.MerchNotiMapper;
-import com.emato.cuspay.dto.merch.MerchNoti;
+import com.emato.cuspay.entity.merch.MerchNoti;
 import com.emato.cuspay.support.msg.resp.ResponseMessage;
 import com.emato.cuspay.support.msg.resp.ResponseStatus;
 import com.emato.cuspay.util.OkHttpUtils;

src/main/java/com/emato/cuspay/base/merch/MerchCusService.java → src/main/java/com/emato/cuspay/service/MerchCusService.java

@@ -1,6 +1,6 @@
-package com.emato.cuspay.base.merch;
+package com.emato.cuspay.service;
 
-import com.emato.cuspay.dto.merch.MerchCusCfg;
+import com.emato.cuspay.entity.merch.MerchCusCfg;
 
 import java.util.List;
 

src/main/java/com/emato/cuspay/base/merch/MerchNotiService.java → src/main/java/com/emato/cuspay/service/MerchNotiService.java

@@ -1,6 +1,6 @@
-package com.emato.cuspay.base.merch;
+package com.emato.cuspay.service;
 
-import com.emato.cuspay.dto.merch.MerchNoti;
+import com.emato.cuspay.entity.merch.MerchNoti;
 
 import java.util.List;
 

src/main/java/com/emato/cuspay/base/merch/MerchPaymentService.java → src/main/java/com/emato/cuspay/service/MerchPaymentService.java

@@ -1,8 +1,8 @@
-package com.emato.cuspay.base.merch;
+package com.emato.cuspay.service;
 
 
 
-import com.emato.cuspay.dto.merch.MerchPayCfg;
+import com.emato.cuspay.entity.merch.MerchPayCfg;
 import com.emato.cuspay.support.msg.resp.ResponseMessage;
 
 import java.util.List;

src/main/java/com/emato/cuspay/base/merch/impl/MerchCusServiceImpl.java → src/main/java/com/emato/cuspay/service/impl/MerchCusServiceImpl.java

@@ -1,8 +1,8 @@
-package com.emato.cuspay.base.merch.impl;
+package com.emato.cuspay.service.impl;
 
-import com.emato.cuspay.base.merch.MerchCusService;
+import com.emato.cuspay.service.MerchCusService;
 import com.emato.cuspay.dao.mapper.merch.MerchCusCfgMapper;
-import com.emato.cuspay.dto.merch.MerchCusCfg;
+import com.emato.cuspay.entity.merch.MerchCusCfg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

src/main/java/com/emato/cuspay/base/merch/impl/MerchNotiServiceImpl.java → src/main/java/com/emato/cuspay/service/impl/MerchNotiServiceImpl.java

@@ -1,15 +1,16 @@
-package com.emato.cuspay.base.merch.impl;
+package com.emato.cuspay.service.impl;
 
-import com.emato.cuspay.base.merch.MerchNotiService;
+import com.emato.cuspay.service.MerchNotiService;
 import com.emato.cuspay.dao.mapper.merch.MerchNotiMapper;
-import com.emato.cuspay.dto.merch.MerchNoti;
+import com.emato.cuspay.entity.merch.MerchNoti;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 
 /**
- * @author zengjun
+ * 商户通知信息
+ * @author zx
  * @version 1.0
  * 2018-05-19 15:42
  */

src/main/java/com/emato/cuspay/base/merch/impl/MerchPaymentServiceImpl.java → src/main/java/com/emato/cuspay/service/impl/MerchPaymentServiceImpl.java

@@ -1,17 +1,16 @@
-package com.emato.cuspay.base.merch.impl;
+package com.emato.cuspay.service.impl;
 
 
 
 
 
-import com.emato.cuspay.base.merch.MerchPaymentService;
+import com.emato.cuspay.service.MerchPaymentService;
 import com.emato.cuspay.common.contant.TablePrimaryKeyPrefix;
 import com.emato.cuspay.common.core.db.IdWorkerAide;
 import com.emato.cuspay.dao.mapper.merch.MerchPayCfgMapper;
-import com.emato.cuspay.dto.merch.MerchPayCfg;
+import com.emato.cuspay.entity.merch.MerchPayCfg;
 import com.emato.cuspay.support.msg.resp.ResponseMessage;
 import com.emato.cuspay.support.msg.resp.ResponseStatus;
-import com.emato.cuspay.wx.service.impl.WxCbPayDocServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +32,7 @@ public class MerchPaymentServiceImpl implements MerchPaymentService {
 
     public ResponseMessage addMerchPayCfg(MerchPayCfg merchPayCfg) {
         merchPayCfg.setPayCfgSn(TablePrimaryKeyPrefix.merch_pay_cfg_type + IdWorkerAide.nextId());
+        merchPayCfg.setIsValid("0");
 
         try {
             MerchPayCfg payCfg = new MerchPayCfg();

src/main/java/com/emato/cuspay/support/msg/resp/ResponseMessage.java

@@ -3,7 +3,6 @@ package com.emato.cuspay.support.msg.resp;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/emato/cuspay/task/wx/MerchantNoticeTimer.java → src/main/java/com/emato/cuspay/task/MerchantNoticeTimer.java

@@ -1,4 +1,4 @@
-package com.emato.cuspay.task.wx;
+package com.emato.cuspay.task;
 
 
 import com.emato.cuspay.notify.MerchantNotice;

src/main/java/com/emato/cuspay/web/controller/merch/MerchPaymentController.java

@@ -1,7 +1,7 @@
 package com.emato.cuspay.web.controller.merch;
 
-import com.emato.cuspay.dto.merch.MerchPayCfg;
-import com.emato.cuspay.base.merch.MerchPaymentService;
+import com.emato.cuspay.entity.merch.MerchPayCfg;
+import com.emato.cuspay.service.MerchPaymentService;
 import com.emato.cuspay.support.msg.resp.ResponseMessage;
 import com.emato.cuspay.support.msg.resp.ResponseStatus;
 import com.emato.cuspay.util.MapBeanUtils;

src/main/java/com/emato/cuspay/wx/common/MerchNotiBuilder.java

@@ -2,9 +2,9 @@ package com.emato.cuspay.wx.common;
 
 import com.emato.cuspay.common.contant.TablePrimaryKeyPrefix;
 import com.emato.cuspay.common.core.db.IdWorkerAide;
-import com.emato.cuspay.dto.merch.MerchNoti;
-import com.emato.cuspay.dto.merch.MerchPayCfg;
-import com.emato.cuspay.wx.dao.entity.WxCbPayDoc;
+import com.emato.cuspay.entity.merch.MerchNoti;
+import com.emato.cuspay.entity.merch.MerchPayCfg;
+import com.emato.cuspay.wx.entity.WxCbPayDoc;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

src/main/java/com/emato/cuspay/wx/controller/WxCusController.java

@@ -1,6 +1,6 @@
 package com.emato.cuspay.wx.controller;
 
-import com.emato.cuspay.wx.dao.entity.WxCbPayDoc;
+import com.emato.cuspay.wx.entity.WxCbPayDoc;
 import com.emato.cuspay.support.msg.resp.ResponseMessage;
 import com.emato.cuspay.support.msg.resp.ResponseStatus;
 import com.emato.cuspay.util.MapBeanUtils;

src/main/java/com/emato/cuspay/wx/declare/AbstractCusDeclare.java

@@ -5,15 +5,10 @@ package com.emato.cuspay.wx.declare;
 
 
 
-import com.emato.cuspay.base.merch.MerchCusService;
-import com.emato.cuspay.base.merch.MerchPaymentService;
-import com.emato.cuspay.dto.merch.MerchCusCfg;
-import com.emato.cuspay.dto.merch.MerchNoti;
-import com.emato.cuspay.dto.merch.MerchPayCfg;
+import com.emato.cuspay.service.MerchPaymentService;
+import com.emato.cuspay.entity.merch.MerchPayCfg;
 import com.google.common.collect.Maps;
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.BeanPostProcessor;
 
 import javax.annotation.PostConstruct;
 import java.util.List;

src/main/java/com/emato/cuspay/wx/declare/WxCusDeclare.java

@@ -1,20 +1,17 @@
 package com.emato.cuspay.wx.declare;
 
-import com.emato.cuspay.base.merch.MerchCusService;
-import com.emato.cuspay.base.merch.MerchNotiService;
+import com.emato.cuspay.service.MerchNotiService;
 import com.emato.cuspay.common.contant.MerchNoticeDict;
-import com.emato.cuspay.dto.merch.MerchCusCfg;
 import com.emato.cuspay.wx.common.MerchNotiBuilder;
 import com.emato.cuspay.wx.common.WxContants;
 import com.emato.cuspay.wx.common.WxDict;
 import com.emato.cuspay.common.contant.TablePrimaryKeyPrefix;
 import com.emato.cuspay.common.core.db.IdWorkerAide;
-import com.emato.cuspay.dao.mapper.merch.MerchNotiMapper;
 import com.emato.cuspay.wx.dto.WxResponseMsg;
-import com.emato.cuspay.dto.merch.MerchNoti;
-import com.emato.cuspay.dto.merch.MerchPayCfg;
-import com.emato.cuspay.wx.dao.entity.WxCbPayDoc;
-import com.emato.cuspay.wx.dao.entity.WxPayError;
+import com.emato.cuspay.entity.merch.MerchNoti;
+import com.emato.cuspay.entity.merch.MerchPayCfg;
+import com.emato.cuspay.wx.entity.WxCbPayDoc;
+import com.emato.cuspay.wx.entity.WxPayError;
 import com.emato.cuspay.util.OkHttpUtils;
 import com.emato.cuspay.util.XmlUtils;
 import com.emato.cuspay.wx.service.WxCbPayDocService;
@@ -80,10 +77,15 @@ public class WxCusDeclare extends AbstractCusDeclare implements CusDeclare{
         limit = (limit != null && limit > 0) ? limit : 20;
         count = (count != null && count > 0) ? count : 10;
 
-        List<WxCbPayDoc> wxCbPayDocs = wxCbPayDocService.selectBeDeclaredData(limit);
-
-        if (wxCbPayDocs == null || wxCbPayDocs.isEmpty()) {
-            logger.info("没有待申报微信推海关的支付数据");
+        List<WxCbPayDoc> wxCbPayDocs = null;
+        try {
+            wxCbPayDocs = wxCbPayDocService.selectBeDeclaredData(limit);
+            if (wxCbPayDocs == null || wxCbPayDocs.isEmpty()) {
+                logger.info("没有待申报微信推海关的支付数据");
+                return;
+            }
+        } catch (Exception e) {
+            logger.error("查询待申报微信推海关的支付数据异常", e);
             return;
         }
 
@@ -176,6 +178,7 @@ public class WxCusDeclare extends AbstractCusDeclare implements CusDeclare{
                 if (WxContants.RETURN_CODE_FAIL.equals(wxResponseMsgDto.getReturnCode()) ||
                         WxContants.FAIL.equals(wxResponseMsgDto.getReturnCode())) {
                     wxCbPayDoc.setDocStatus(WxDict.PaymentDocStatus.i_03.getItem());
+
                     wxCbPayDocService.updateWxCbPay(wxCbPayDoc);
 
                     //通知商户

src/main/java/com/emato/cuspay/wx/dao/entity/WxCbPayDoc.java → src/main/java/com/emato/cuspay/wx/entity/WxCbPayDoc.java

@@ -1,4 +1,4 @@
-package com.emato.cuspay.wx.dao.entity;
+package com.emato.cuspay.wx.entity;
 
 import java.io.Serializable;
 import java.util.Date;

src/main/java/com/emato/cuspay/wx/dao/entity/WxPayError.java → src/main/java/com/emato/cuspay/wx/entity/WxPayError.java

@@ -1,4 +1,4 @@
-package com.emato.cuspay.wx.dao.entity;
+package com.emato.cuspay.wx.entity;
 
 import java.io.Serializable;
 import java.util.Date;

src/main/java/com/emato/cuspay/wx/service/WxCbPayDocService.java

@@ -1,6 +1,6 @@
 package com.emato.cuspay.wx.service;
 
-import com.emato.cuspay.wx.dao.entity.WxCbPayDoc;
+import com.emato.cuspay.wx.entity.WxCbPayDoc;
 import com.emato.cuspay.support.msg.resp.ResponseMessage;
 import org.springframework.stereotype.Component;
 

src/main/java/com/emato/cuspay/wx/service/WxPayErrorService.java

@@ -1,6 +1,7 @@
 package com.emato.cuspay.wx.service;
 
-import com.emato.cuspay.wx.dao.entity.WxPayError;
+import com.emato.cuspay.wx.entity.WxPayError;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -9,6 +10,7 @@ import java.util.List;
  * @version 1.0
  * 2018-05-19 15:58
  */
+@Component
 public interface WxPayErrorService {
 
     int insertWxPayErrorBatch(List<WxPayError> wxPayErrors);

src/main/java/com/emato/cuspay/wx/service/impl/WxCbPayDocServiceImpl.java

@@ -5,9 +5,8 @@ import com.emato.cuspay.common.contant.TablePrimaryKeyPrefix;
 import com.emato.cuspay.common.core.db.IdWorkerAide;
 import com.emato.cuspay.dao.mapper.merch.MerchPayCfgMapper;
 import com.emato.cuspay.dao.mapper.wx.WxCbPayDocMapper;
-import com.emato.cuspay.dto.merch.MerchPayCfg;
-import com.emato.cuspay.wx.controller.WxCusController;
-import com.emato.cuspay.wx.dao.entity.WxCbPayDoc;
+import com.emato.cuspay.entity.merch.MerchPayCfg;
+import com.emato.cuspay.wx.entity.WxCbPayDoc;
 import com.emato.cuspay.support.msg.resp.ResponseMessage;
 import com.emato.cuspay.support.msg.resp.ResponseStatus;
 import com.emato.cuspay.util.jackson.JacksonUtil;

src/main/java/com/emato/cuspay/wx/service/impl/WxPayErrorServiceImpl.java

@@ -1,7 +1,7 @@
 package com.emato.cuspay.wx.service.impl;
 
 import com.emato.cuspay.dao.mapper.wx.WxPayErrorMapper;
-import com.emato.cuspay.wx.dao.entity.WxPayError;
+import com.emato.cuspay.wx.entity.WxPayError;
 import com.emato.cuspay.wx.service.WxPayErrorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

src/main/resources/mybatis/mapper/MerchCusCfgMapper.xml

@@ -1,7 +1,7 @@
 <?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.emato.cuspay.dao.mapper.merch.MerchCusCfgMapper" >
-  <resultMap id="BaseResultMap" type="com.emato.cuspay.dto.merch.MerchCusCfg" >
+  <resultMap id="BaseResultMap" type="com.emato.cuspay.entity.merch.MerchCusCfg" >
     <id column="cus_cfg_sn" property="cusCfgSn" jdbcType="VARCHAR" />
     <result column="merch_sn" property="merchSn" jdbcType="VARCHAR" />
     <result column="cus_flag" property="cusFlag" jdbcType="VARCHAR" />
@@ -29,7 +29,7 @@
     delete from merch_cus_cfg
     where cus_cfg_sn = #{cusCfgSn,jdbcType=VARCHAR}
   </delete>
-  <insert id="insertSelective" parameterType="com.emato.cuspay.dto.merch.MerchCusCfg" >
+  <insert id="insertSelective" parameterType="com.emato.cuspay.entity.merch.MerchCusCfg" >
     insert into merch_cus_cfg
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="cusCfgSn != null" >
@@ -96,7 +96,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.emato.cuspay.dto.merch.MerchCusCfg" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.emato.cuspay.entity.merch.MerchCusCfg" >
     update merch_cus_cfg
     <set >
       <if test="merchSn != null" >

src/main/resources/mybatis/mapper/MerchNotiMapper.xml

@@ -1,7 +1,7 @@
 <?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.emato.cuspay.dao.mapper.merch.MerchNotiMapper" >
-  <resultMap id="BaseResultMap" type="com.emato.cuspay.dto.merch.MerchNoti" >
+  <resultMap id="BaseResultMap" type="com.emato.cuspay.entity.merch.MerchNoti" >
     <id column="noti_sn" property="notiSn" jdbcType="VARCHAR" />
     <result column="all_pay_sn" property="allPaySn" jdbcType="VARCHAR" />
     <result column="merch_sn" property="merchSn" jdbcType="VARCHAR" />
@@ -48,7 +48,7 @@
     where noti_sn = #{notiSn,jdbcType=VARCHAR}
   </delete>
 
-  <insert id="insertSelective" parameterType="com.emato.cuspay.dto.merch.MerchNoti" >
+  <insert id="insertSelective" parameterType="com.emato.cuspay.entity.merch.MerchNoti" >
     insert into merch_noti
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="notiSn != null" >
@@ -223,7 +223,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.emato.cuspay.dto.merch.MerchNoti" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.emato.cuspay.entity.merch.MerchNoti" >
     update merch_noti
     <set >
       <if test="allPaySn != null" >

src/main/resources/mybatis/mapper/MerchPayCfgMapper.xml

@@ -1,7 +1,7 @@
 <?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.emato.cuspay.dao.mapper.merch.MerchPayCfgMapper" >
-  <resultMap id="BaseResultMap" type="com.emato.cuspay.dto.merch.MerchPayCfg" >
+  <resultMap id="BaseResultMap" type="com.emato.cuspay.entity.merch.MerchPayCfg" >
     <id column="pay_cfg_sn" property="payCfgSn" jdbcType="VARCHAR" />
     <result column="merch_sn" property="merchSn" jdbcType="VARCHAR" />
     <result column="merch_wx_api_key" property="merchWxApiKey" jdbcType="VARCHAR" />
@@ -30,7 +30,7 @@
     delete from merch_pay_cfg
     where pay_cfg_sn = #{payCfgSn,jdbcType=VARCHAR}
   </delete>
-  <insert id="insertSelective" parameterType="com.emato.cuspay.dto.merch.MerchPayCfg" >
+  <insert id="insertSelective" parameterType="com.emato.cuspay.entity.merch.MerchPayCfg" >
     insert into merch_pay_cfg
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="payCfgSn != null" >
@@ -109,7 +109,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.emato.cuspay.dto.merch.MerchPayCfg" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.emato.cuspay.entity.merch.MerchPayCfg" >
     update merch_pay_cfg
     <set >
       <if test="merchSn != null" >
@@ -161,7 +161,7 @@
     FROM merch_pay_cfg
   </select>
 
-  <select id="getMerchPayCfgByMerchsnAndChnlFlag" resultMap="BaseResultMap" parameterType="com.emato.cuspay.dto.merch.MerchPayCfg">
+  <select id="getMerchPayCfgByMerchsnAndChnlFlag" resultMap="BaseResultMap" parameterType="com.emato.cuspay.entity.merch.MerchPayCfg">
     SELECT
     <include refid="Base_Column_List" />
     FROM merch_pay_cfg WHERE merch_sn = #{merchSn} AND pay_chnl_flag = #{payChnlFlag}

src/main/resources/mybatis/mapper/wx/WxCbPayDocMapper.xml

@@ -1,7 +1,7 @@
 <?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.emato.cuspay.dao.mapper.wx.WxCbPayDocMapper" >
-  <resultMap id="BaseResultMap" type="com.emato.cuspay.wx.dao.entity.WxCbPayDoc" >
+  <resultMap id="BaseResultMap" type="com.emato.cuspay.wx.entity.WxCbPayDoc" >
     <id column="wx_pay_sn" property="wxPaySn" jdbcType="VARCHAR" />
     <result column="merch_sn" property="merchSn" jdbcType="VARCHAR" />
     <result column="merch_name" property="merchName" jdbcType="VARCHAR" />
@@ -64,7 +64,7 @@
     where wx_pay_sn = #{wxPaySn,jdbcType=VARCHAR}
   </delete>
 
-  <insert id="insertSelective" parameterType="com.emato.cuspay.wx.dao.entity.WxCbPayDoc" >
+  <insert id="insertSelective" parameterType="com.emato.cuspay.wx.entity.WxCbPayDoc" >
     insert into wx_cb_pay_doc
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="wxPaySn != null" >
@@ -318,7 +318,7 @@
     </trim>
   </insert>
 
-  <update id="updateByPrimaryKeySelective" parameterType="com.emato.cuspay.wx.dao.entity.WxCbPayDoc" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.emato.cuspay.wx.entity.WxCbPayDoc" >
     update wx_cb_pay_doc
     <set >
       <if test="merchSn != null" >

src/main/resources/mybatis/mapper/wx/WxPayErrorMapper.xml

@@ -1,7 +1,7 @@
 <?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.emato.cuspay.dao.mapper.wx.WxPayErrorMapper" >
-  <resultMap id="BaseResultMap" type="com.emato.cuspay.wx.dao.entity.WxPayError" >
+  <resultMap id="BaseResultMap" type="com.emato.cuspay.wx.entity.WxPayError" >
     <id column="error_sn" property="errorSn" jdbcType="VARCHAR" />
     <result column="wx_pay_sn" property="wxPaySn" jdbcType="VARCHAR" />
     <result column="merch_sn" property="merchSn" jdbcType="VARCHAR" />
@@ -39,7 +39,7 @@
     delete from wx_pay_error
     where error_sn = #{errorSn,jdbcType=VARCHAR}
   </delete>
-  <insert id="insertSelective" parameterType="com.emato.cuspay.wx.dao.entity.WxPayError" >
+  <insert id="insertSelective" parameterType="com.emato.cuspay.wx.entity.WxPayError" >
     insert into wx_pay_error
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="errorSn != null" >
@@ -172,7 +172,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.emato.cuspay.wx.dao.entity.WxPayError" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.emato.cuspay.wx.entity.WxPayError" >
     update wx_pay_error
     <set >
       <if test="wxPaySn != null" >