顺一遍流程

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/dao/dbModel/PartnerDM.java

 package com.freemud.pay.job.dao.dbModel;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serializable;
 
-public class PartnerDM extends BaseModel implements Serializable {
+public class PartnerDM extends BaseModel{
+
     private Integer id;
 
     private String partnername;

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/dao/dbModel/PayDM.java

 package com.freemud.pay.job.dao.dbModel;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class PayDM extends BaseModel implements Serializable {
+public class PayDM extends BaseModel {
+
     private Long id;
 
     private String storeId;

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/dao/dbModel/PayMessageActiveDM.java

 package com.freemud.pay.job.dao.dbModel;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class PayMessageActiveDM extends BaseModel implements Serializable {
+public class PayMessageActiveDM extends BaseModel {
+
     private Long id;
 
     private Integer partnerid;

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/dao/dbModel/PayMessageDM.java

 package com.freemud.pay.job.dao.dbModel;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
 
-public class PayMessageDM extends BaseModel implements Serializable {
+public class PayMessageDM extends BaseModel {
+
     private Long id;
 
     private Integer partnerid;
@@ -29,12 +34,17 @@ public class PayMessageDM extends BaseModel implements Serializable {
     private String store_id;
 
     private Double amount;
+
     private String operator_Id;
+
     private String station_Id;
+
     private Double mCoupon;
+
     private Double pCoupon;
 
     private String platformTradeNumber;
+
     private String platform;
 
     private String subUserId;

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/dao/mapper/PartnerDMMapper.java

@@ -4,15 +4,5 @@ import com.freemud.pay.job.dao.IBaseDao;
 import com.freemud.pay.job.dao.dbModel.PartnerDM;
 
 public interface PartnerDMMapper extends IBaseDao<PartnerDM>{
-    int deleteByPrimaryKey(Integer id);
 
-    int insert(PartnerDM record);
-
-    int insertSelective(PartnerDM record);
-
-    PartnerDM selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(PartnerDM record);
-
-    int updateByPrimaryKey(PartnerDM record);
 }
\ No newline at end of file

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/dao/mapper/PayDMMapper.java

@@ -4,21 +4,8 @@ import com.freemud.pay.job.dao.IBaseDao;
 import com.freemud.pay.job.dao.dbModel.PayDM;
 
 public interface PayDMMapper extends IBaseDao<PayDM> {
-    int deleteByPrimaryKey(Long id);
-
-    @Override
-    int insert(PayDM record);
-
-    @Override
-    int insertSelective(PayDM record);
-
-    PayDM selectByPrimaryKey(Long id);
 
     PayDM selectByZhuiOrderId(String zhuihuorderid);
 
-    @Override
-    int updateByPrimaryKeySelective(PayDM record);
 
-    @Override
-    int updateByPrimaryKey(PayDM record);
 }
\ No newline at end of file

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/dao/mapper/PayMessageActiveDMMapper.java

@@ -7,18 +7,6 @@ import java.util.List;
 import java.util.Map;
 
 public interface PayMessageActiveDMMapper extends IBaseDao<PayMessageActiveDM> {
-    int deleteByPrimaryKey(Long id);
-    @Override
-    int insert(PayMessageActiveDM record);
-    @Override
-    int insertSelective(PayMessageActiveDM record);
-
-    PayMessageActiveDM selectByPrimaryKey(Long id);
-    @Override
-    int updateByPrimaryKeySelective(PayMessageActiveDM record);
-
-    @Override
-    int updateByPrimaryKey(PayMessageActiveDM record);
 
     PayMessageActiveDM getPayMessageActiveDM(Map<String, Object> paramsMap);
 

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/dao/mapper/PayMessageDMMapper.java

@@ -2,28 +2,17 @@ package com.freemud.pay.job.dao.mapper;
 
 import com.freemud.pay.job.dao.IBaseDao;
 import com.freemud.pay.job.dao.dbModel.PayMessageDM;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
 
 public interface PayMessageDMMapper extends IBaseDao<PayMessageDM>{
-    int deleteByPrimaryKey(Long id);
-
-    @Override
-    int insert(PayMessageDM record);
-
-    @Override
-    int insertSelective(PayMessageDM record);
-
-    PayMessageDM selectByPrimaryKey(Long id);
-    @Override
-    int updateByPrimaryKeySelective(PayMessageDM record);
-    @Override
-    int updateByPrimaryKey(PayMessageDM record);
 
     List<PayMessageDM> getPayMessages(Map<String, Object> paramsMap);
 
-    int updateMessageStatus(Integer status,Long id);
+    int updateMessageStatus(@Param("status") Integer status, @Param("id") Long id);
+
+    int updateMessageTryTimes(@Param("trytimes") Integer trytimes,@Param("id") Long id);
 
-    int updateMessageTryTimes(Integer trytimes,Long id);
 }
\ No newline at end of file

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/dao/repository/IPayMessageRepository.java

@@ -20,4 +20,5 @@ public interface IPayMessageRepository extends IBaseRepository{
      List<PayMessageDM> getPayMessages(Map<String, Object> paramsMap);
      int updateMessageStatus(Integer status,Long id);
      int updateMessageTryTimes(Integer trytimes,Long id);
+     PayMessageDM selectById(Integer id);
 }

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/dao/repository/impl/ActiveRepositoryImpl.java

@@ -5,6 +5,8 @@ import com.freemud.pay.job.dao.dbModel.ActiveDM;
 import com.freemud.pay.job.dao.mapper.ActiveDMMapper;
 import com.freemud.pay.job.dao.repository.IActiveRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Repository;
 
 /**
  * All rights Reserved, Designed By www.freemud.cn
@@ -17,6 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @Copyright: 2017 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
+@Primary
+@Repository
 public class ActiveRepositoryImpl extends BaseRepositoryImpl implements IActiveRepository {
 
     @Autowired
@@ -29,8 +33,7 @@ public class ActiveRepositoryImpl extends BaseRepositoryImpl implements IActiveR
 
     @Override
     public ActiveDM selectByPrimaryKey(Integer activeid) {
-        return activeDMMapper.selectByPrimaryKey(activeid);
+        return this.getById(activeid);
     }
 
-
 }
\ No newline at end of file

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/dao/repository/impl/PayMessageRepositoryImpl.java

 package com.freemud.pay.job.dao.repository.impl;
 
 import com.freemud.pay.job.dao.IBaseDao;
+import com.freemud.pay.job.dao.dbModel.BaseModel;
 import com.freemud.pay.job.dao.dbModel.PayMessageDM;
 import com.freemud.pay.job.dao.mapper.PayMessageDMMapper;
 import com.freemud.pay.job.dao.repository.IPayMessageRepository;
+import com.freemud.pay.job.entity.PayMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Repository;
@@ -48,4 +50,11 @@ public class PayMessageRepositoryImpl extends BaseRepositoryImpl implements IPay
     public int updateMessageTryTimes(Integer trytimes, Long id) {
         return payMessageMapper.updateMessageTryTimes(trytimes,id);
     }
+
+
+@Override
+    public PayMessageDM selectById(Integer id) {
+        return this.getById(id);
+    }
+
 }
\ No newline at end of file

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/IPayMessageService.java

@@ -22,4 +22,5 @@ public interface IPayMessageService {
     int updateMessageStatus(Integer status,Long id);
     List<PayMessageDM> getPayMessages(BaseParam baseParam);
     int updateMessageTryTimes(Integer trytimes,Long id);
+    PayMessageDM selectByPrimaryKey(Long id);
 }

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/impl/ActiveServiceImpl.java

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Service;
  * @Copyright: 2017 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Service
+@Service("iActiveService")
 public class ActiveServiceImpl implements IActiveService {
 
     @Autowired

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/impl/AliFuWuChuangSingleMessageSender.java

@@ -12,6 +12,7 @@ import com.freemud.pay.job.entity.PayMessage;
 import com.freemud.pay.job.service.*;
 import com.freemud.pay.job.service.util.InterrprentUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.io.*;
 import java.text.SimpleDateFormat;

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/impl/PartnerServiceImpl.java

@@ -19,7 +19,7 @@ import java.util.List;
  * @Copyright: 2017 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Service()
+@Service("iPartnerService")
 public class PartnerServiceImpl implements IPartnerService {
 
     @Autowired

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/impl/PayMessageActiveServiceImpl.java

@@ -21,7 +21,7 @@ import java.util.Map;
  * @Copyright: 2017 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Service
+@Service("iPayMessageActiveService")
 public class PayMessageActiveServiceImpl implements IPayMessageActiveService {
 
     @Autowired

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/impl/PayMessageServiceImpl.java

@@ -10,8 +10,10 @@ import com.freemud.pay.job.service.IMessageProcessor;
 import com.freemud.pay.job.service.IPayMessageService;
 import com.freemud.pay.job.service.MessageProcessorFactory;
 import com.freemud.pay.job.service.IPayMessageActiveService;
+import groovy.util.logging.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -30,7 +32,8 @@ import java.util.Map;
  * @Copyright: 2017 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-//@Service("iPayMessageService")
+@Primary
+@Service("payMessageServiceImpl")
 public class PayMessageServiceImpl implements IPayMessageService {
 
     @Autowired
@@ -134,5 +137,10 @@ public class PayMessageServiceImpl implements IPayMessageService {
         return iPayMessageRepository.updateMessageTryTimes(trytimes,id);
     }
 
+    @Override
+    public PayMessageDM selectByPrimaryKey(Long id) {
+        return null;
+    }
+
 
 }
\ No newline at end of file

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/impl/PayPlatformAccountServiceImpl.java

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Service;
  * @Copyright: 2017 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Service
+@Service("iPayPlatformAccountService")
 public class PayPlatformAccountServiceImpl implements IPayPlatformAccountService {
 
     @Autowired

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/impl/PayServiceImpl.java

@@ -18,7 +18,7 @@ import org.springframework.stereotype.Service;
  * @Copyright: 2017 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Service("ayServiceImp")
+@Service("iPayService")
 public class PayServiceImpl implements IPayService {
 
     @Autowired

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/impl/StoreServiceImpl.java

@@ -21,7 +21,7 @@ import java.util.Map;
  * @Copyright: 2017 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-@Service()
+@Service("iStoreService")
 public class StoreServiceImpl implements IStoreService {
 
     @Autowired

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/util/EncryptionHelper.java

+package com.freemud.pay.job.service.util;
+
+import org.apache.commons.lang.StringUtils;
+
+public class EncryptionHelper {
+    private static final String a = "k";
+    private static final char p = 'A';
+
+    public final String Encode(String value) {
+        return p + c.E(value, a);
+    }
+
+    public final String Decode(String value) {
+        if (value.charAt(0) == p) {
+            return c.D(value.substring(1), a);
+        }
+        return null;
+        //throw new CryptographicException(String.format("invalid value:%1$s", value));
+    }
+
+    private static class c {
+        // private static string _b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijk.mnopqrstuvwxyz-123456789+/=";
+        private static String _b64 = "GHIZab789+cdefgjk.mnopqvwxyz-14JKLMNhiOPVW23XYQR56/=STABCDrstuEFU";
+
+        public static String E(String d, String f) {
+            int k = 0;
+            String b = "";
+            for (char c : d.toCharArray()) {
+                int xor = ((int) c ^ (int) f.charAt(k)) + (f.length());
+                if (++k >= f.length()) {
+                    k = 0;
+                }
+
+                b += F(xor, 8);
+            }
+
+            int m = 0;
+            String q = "";
+            for (int i = 0; i < b.length(); i += 4) {
+                int v = B(b.substring(i, i + 4));
+                q += G(v * 4 + m);
+                if (++m > 3) {
+                    m = 0;
+                }
+            }
+            return q;
+        }
+
+        public static String D(String p, String q) {
+            int m = 0;
+            String b = "";
+            for (char c : p.toCharArray()) {
+                int v = (H(c) - m) / 4;
+                b += F(v, 4);
+                if (++m > 3) {
+                    m = 0;
+                }
+            }
+
+            int k = 0;
+            String d = "";
+            for (int i = 0; i < b.length(); i += 8) {
+                if (i + 8 > b.length()) {
+                    break;
+                }
+                int c = B(b.substring(i, i + 8));
+                int dc = (c - q.length()) ^ (int) q.charAt(k);
+
+                if (++k >= q.length()) {
+                    k = 0;
+                }
+
+                d += new String(new char[]{(char) dc});
+//				d += new String((char)dc, 1);
+            }
+            return d;
+        }
+
+        private static int H(char n) {
+            return _b64.indexOf(n);
+        }
+
+        private static String G(int n) {
+            if (n > _b64.length()) {
+                return "=";
+            }
+
+            return new String(new char[]{_b64.charAt(n)});
+        }
+
+        private static String F(int x, int z) {
+            String b = "";
+
+            while (x > 0) {
+                b += x % 2;
+                x /= 2;
+            }
+
+            String r = "";
+            for (char c : b.toCharArray()) {
+                r = new String(new char[]{(char) c}) + r;
+            }
+            b = r;
+            String test = "";
+
+//			b = new String(new char[]{(char)'0'}, z - b.length()) + b;
+            b = StringUtils.leftPad(test, z - b.length(), (char) '0') + b;
+
+            return b;
+        }
+
+        private static int B(String b) {
+            return Integer.parseInt(b, 2);
+        }
+    }
+}
\ No newline at end of file

freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/util/InterrprentUtil.java

@@ -59,9 +59,10 @@ public class InterrprentUtil {
         if (context.getPayMessageActive().getCouponactiveid() > 0)
         {
             /**
-             * todo code 解密没有
+             * todo code 解密沒有
              */
-            String code = context.getPayMessage().getCode().isEmpty()?"":context.getPayMessage().getCode().trim();
+            EncryptionHelper encryptionHelper = new EncryptionHelper();
+            String code = context.getPayMessage().getCode().isEmpty()?null:encryptionHelper.Decode(context.getPayMessage().getCode().trim());
 
 
 //                    string.IsNullOrWhiteSpace()

freemud-pay-module/freemud-pay-push-message/src/main/resources/application.properties

@@ -25,3 +25,5 @@ spring.datasource.username=zhuihutest
 spring.datasource.password=zhuihutest@freemud
 spring.datasource.url=jdbc:sqlserver://115.159.142.32:9528
 spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
+
+mybatis.mapper-locations= classpath:mapper/*.xml

freemud-pay-module/freemud-pay-push-message/src/main/resources/mapper/PartnerDMMapper.xml

@@ -18,153 +18,4 @@
     ID, PartnerName, OurAccount_Partner, Logo, Description, PartnerCode, AppSecret, EBCode, 
     EnableSMS, PartnerType, UnifyId
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from Partner
-    where ID = #{id,jdbcType=INTEGER}
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from Partner
-    where ID = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from Partner
-    where ID = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.freemud.pay.job.dao.dbModel.PartnerDM">
-    insert into Partner (ID, PartnerName, OurAccount_Partner, 
-      Logo, Description, PartnerCode, 
-      AppSecret, EBCode, EnableSMS, 
-      PartnerType, UnifyId)
-    values (#{id,jdbcType=INTEGER}, #{partnername,jdbcType=VARCHAR}, #{ouraccountPartner,jdbcType=VARCHAR}, 
-      #{logo,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{partnercode,jdbcType=VARCHAR}, 
-      #{appsecret,jdbcType=VARCHAR}, #{ebcode,jdbcType=VARCHAR}, #{enablesms,jdbcType=BIT}, 
-      #{partnertype,jdbcType=VARCHAR}, #{unifyid,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.freemud.pay.job.dao.dbModel.PartnerDM">
-    insert into Partner
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        ID,
-      </if>
-      <if test="partnername != null">
-        PartnerName,
-      </if>
-      <if test="ouraccountPartner != null">
-        OurAccount_Partner,
-      </if>
-      <if test="logo != null">
-        Logo,
-      </if>
-      <if test="description != null">
-        Description,
-      </if>
-      <if test="partnercode != null">
-        PartnerCode,
-      </if>
-      <if test="appsecret != null">
-        AppSecret,
-      </if>
-      <if test="ebcode != null">
-        EBCode,
-      </if>
-      <if test="enablesms != null">
-        EnableSMS,
-      </if>
-      <if test="partnertype != null">
-        PartnerType,
-      </if>
-      <if test="unifyid != null">
-        UnifyId,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="partnername != null">
-        #{partnername,jdbcType=VARCHAR},
-      </if>
-      <if test="ouraccountPartner != null">
-        #{ouraccountPartner,jdbcType=VARCHAR},
-      </if>
-      <if test="logo != null">
-        #{logo,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="partnercode != null">
-        #{partnercode,jdbcType=VARCHAR},
-      </if>
-      <if test="appsecret != null">
-        #{appsecret,jdbcType=VARCHAR},
-      </if>
-      <if test="ebcode != null">
-        #{ebcode,jdbcType=VARCHAR},
-      </if>
-      <if test="enablesms != null">
-        #{enablesms,jdbcType=BIT},
-      </if>
-      <if test="partnertype != null">
-        #{partnertype,jdbcType=VARCHAR},
-      </if>
-      <if test="unifyid != null">
-        #{unifyid,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.freemud.pay.job.dao.dbModel.PartnerDM">
-    update Partner
-    <set>
-      <if test="partnername != null">
-        PartnerName = #{partnername,jdbcType=VARCHAR},
-      </if>
-      <if test="ouraccountPartner != null">
-        OurAccount_Partner = #{ouraccountPartner,jdbcType=VARCHAR},
-      </if>
-      <if test="logo != null">
-        Logo = #{logo,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        Description = #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="partnercode != null">
-        PartnerCode = #{partnercode,jdbcType=VARCHAR},
-      </if>
-      <if test="appsecret != null">
-        AppSecret = #{appsecret,jdbcType=VARCHAR},
-      </if>
-      <if test="ebcode != null">
-        EBCode = #{ebcode,jdbcType=VARCHAR},
-      </if>
-      <if test="enablesms != null">
-        EnableSMS = #{enablesms,jdbcType=BIT},
-      </if>
-      <if test="partnertype != null">
-        PartnerType = #{partnertype,jdbcType=VARCHAR},
-      </if>
-      <if test="unifyid != null">
-        UnifyId = #{unifyid,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where ID = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.freemud.pay.job.dao.dbModel.PartnerDM">
-    update Partner
-    set PartnerName = #{partnername,jdbcType=VARCHAR},
-      OurAccount_Partner = #{ouraccountPartner,jdbcType=VARCHAR},
-      Logo = #{logo,jdbcType=VARCHAR},
-      Description = #{description,jdbcType=VARCHAR},
-      PartnerCode = #{partnercode,jdbcType=VARCHAR},
-      AppSecret = #{appsecret,jdbcType=VARCHAR},
-      EBCode = #{ebcode,jdbcType=VARCHAR},
-      EnableSMS = #{enablesms,jdbcType=BIT},
-      PartnerType = #{partnertype,jdbcType=VARCHAR},
-      UnifyId = #{unifyid,jdbcType=VARCHAR}
-    where ID = #{id,jdbcType=INTEGER}
-  </update>
 </mapper>
\ No newline at end of file

freemud-pay-module/freemud-pay-push-message/src/main/resources/mapper/PayDMMapper.xml

@@ -47,421 +47,12 @@
     LiquidatorCommissionRate, LiquidatorCommissionFee, BankCommissionFee, BankCommissionRate, 
     PayPlatformRate, PayPlatformFee, NetAmount
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+
+  <select id="selectByZhuiOrderId" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from Pay
-    where ID = #{id,jdbcType=BIGINT}
+    where ZhuiHuOrderId = #{zhuiOrderId,jdbcType=VARCHAR}
   </select>
-  <select id="selectByZhuiOrderId" parameterType="jdbcType=VARCHAR" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from Pay
-    where ZhuiOrderId = #{zhuiOrderId,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from Pay
-    where ID = #{id,jdbcType=BIGINT}
-  </delete>
-  <insert id="insert" parameterType="com.freemud.pay.job.dao.dbModel.PayDM">
-    insert into Pay (ID, Store_Id, Station_Id, 
-      Operator_Id, Partner, PartnerAccount, 
-      PartnerOrderID, PlatformTradeAccount, PlatformTradeNumber, 
-      Code, Amount, State, 
-      Subject, Remark, CreateUser, 
-      CreateDate, CancelUser, CancelDate, 
-      Trans_Id, ZhuiHuOrderId, AlipayState, 
-      PlatformPartnerID, PartnerID, PlatformBuyerUserId, 
-      Platform, mcoupon, BusinessDate, 
-      OrginalPayId, pcoupon, LiquidatorCommissionRate, 
-      LiquidatorCommissionFee, BankCommissionFee, 
-      BankCommissionRate, PayPlatformRate, PayPlatformFee, 
-      NetAmount)
-    values (#{id,jdbcType=BIGINT}, #{storeId,jdbcType=VARCHAR}, #{stationId,jdbcType=VARCHAR}, 
-      #{operatorId,jdbcType=VARCHAR}, #{partner,jdbcType=NVARCHAR}, #{partneraccount,jdbcType=VARCHAR}, 
-      #{partnerorderid,jdbcType=VARCHAR}, #{platformtradeaccount,jdbcType=VARCHAR}, #{platformtradenumber,jdbcType=VARCHAR}, 
-      #{code,jdbcType=VARCHAR}, #{amount,jdbcType=DECIMAL}, #{state,jdbcType=INTEGER}, 
-      #{subject,jdbcType=NVARCHAR}, #{remark,jdbcType=NVARCHAR}, #{createuser,jdbcType=VARCHAR}, 
-      #{createdate,jdbcType=TIMESTAMP}, #{canceluser,jdbcType=VARCHAR}, #{canceldate,jdbcType=TIMESTAMP}, 
-      #{transId,jdbcType=VARCHAR}, #{zhuihuorderid,jdbcType=VARCHAR}, #{alipaystate,jdbcType=INTEGER}, 
-      #{platformpartnerid,jdbcType=VARCHAR}, #{partnerid,jdbcType=INTEGER}, #{platformbuyeruserid,jdbcType=VARCHAR}, 
-      #{platform,jdbcType=VARCHAR}, #{mcoupon,jdbcType=DECIMAL}, #{businessdate,jdbcType=VARCHAR}, 
-      #{orginalpayid,jdbcType=BIGINT}, #{pcoupon,jdbcType=DECIMAL}, #{liquidatorcommissionrate,jdbcType=DECIMAL}, 
-      #{liquidatorcommissionfee,jdbcType=DECIMAL}, #{bankcommissionfee,jdbcType=DECIMAL}, 
-      #{bankcommissionrate,jdbcType=DECIMAL}, #{payplatformrate,jdbcType=DECIMAL}, #{payplatformfee,jdbcType=DECIMAL}, 
-      #{netamount,jdbcType=DECIMAL})
-  </insert>
-  <insert id="insertSelective" parameterType="com.freemud.pay.job.dao.dbModel.PayDM">
-    insert into Pay
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        ID,
-      </if>
-      <if test="storeId != null">
-        Store_Id,
-      </if>
-      <if test="stationId != null">
-        Station_Id,
-      </if>
-      <if test="operatorId != null">
-        Operator_Id,
-      </if>
-      <if test="partner != null">
-        Partner,
-      </if>
-      <if test="partneraccount != null">
-        PartnerAccount,
-      </if>
-      <if test="partnerorderid != null">
-        PartnerOrderID,
-      </if>
-      <if test="platformtradeaccount != null">
-        PlatformTradeAccount,
-      </if>
-      <if test="platformtradenumber != null">
-        PlatformTradeNumber,
-      </if>
-      <if test="code != null">
-        Code,
-      </if>
-      <if test="amount != null">
-        Amount,
-      </if>
-      <if test="state != null">
-        State,
-      </if>
-      <if test="subject != null">
-        Subject,
-      </if>
-      <if test="remark != null">
-        Remark,
-      </if>
-      <if test="createuser != null">
-        CreateUser,
-      </if>
-      <if test="createdate != null">
-        CreateDate,
-      </if>
-      <if test="canceluser != null">
-        CancelUser,
-      </if>
-      <if test="canceldate != null">
-        CancelDate,
-      </if>
-      <if test="transId != null">
-        Trans_Id,
-      </if>
-      <if test="zhuihuorderid != null">
-        ZhuiHuOrderId,
-      </if>
-      <if test="alipaystate != null">
-        AlipayState,
-      </if>
-      <if test="platformpartnerid != null">
-        PlatformPartnerID,
-      </if>
-      <if test="partnerid != null">
-        PartnerID,
-      </if>
-      <if test="platformbuyeruserid != null">
-        PlatformBuyerUserId,
-      </if>
-      <if test="platform != null">
-        Platform,
-      </if>
-      <if test="mcoupon != null">
-        mcoupon,
-      </if>
-      <if test="businessdate != null">
-        BusinessDate,
-      </if>
-      <if test="orginalpayid != null">
-        OrginalPayId,
-      </if>
-      <if test="pcoupon != null">
-        pcoupon,
-      </if>
-      <if test="liquidatorcommissionrate != null">
-        LiquidatorCommissionRate,
-      </if>
-      <if test="liquidatorcommissionfee != null">
-        LiquidatorCommissionFee,
-      </if>
-      <if test="bankcommissionfee != null">
-        BankCommissionFee,
-      </if>
-      <if test="bankcommissionrate != null">
-        BankCommissionRate,
-      </if>
-      <if test="payplatformrate != null">
-        PayPlatformRate,
-      </if>
-      <if test="payplatformfee != null">
-        PayPlatformFee,
-      </if>
-      <if test="netamount != null">
-        NetAmount,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="storeId != null">
-        #{storeId,jdbcType=VARCHAR},
-      </if>
-      <if test="stationId != null">
-        #{stationId,jdbcType=VARCHAR},
-      </if>
-      <if test="operatorId != null">
-        #{operatorId,jdbcType=VARCHAR},
-      </if>
-      <if test="partner != null">
-        #{partner,jdbcType=NVARCHAR},
-      </if>
-      <if test="partneraccount != null">
-        #{partneraccount,jdbcType=VARCHAR},
-      </if>
-      <if test="partnerorderid != null">
-        #{partnerorderid,jdbcType=VARCHAR},
-      </if>
-      <if test="platformtradeaccount != null">
-        #{platformtradeaccount,jdbcType=VARCHAR},
-      </if>
-      <if test="platformtradenumber != null">
-        #{platformtradenumber,jdbcType=VARCHAR},
-      </if>
-      <if test="code != null">
-        #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="amount != null">
-        #{amount,jdbcType=DECIMAL},
-      </if>
-      <if test="state != null">
-        #{state,jdbcType=INTEGER},
-      </if>
-      <if test="subject != null">
-        #{subject,jdbcType=NVARCHAR},
-      </if>
-      <if test="remark != null">
-        #{remark,jdbcType=NVARCHAR},
-      </if>
-      <if test="createuser != null">
-        #{createuser,jdbcType=VARCHAR},
-      </if>
-      <if test="createdate != null">
-        #{createdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="canceluser != null">
-        #{canceluser,jdbcType=VARCHAR},
-      </if>
-      <if test="canceldate != null">
-        #{canceldate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="transId != null">
-        #{transId,jdbcType=VARCHAR},
-      </if>
-      <if test="zhuihuorderid != null">
-        #{zhuihuorderid,jdbcType=VARCHAR},
-      </if>
-      <if test="alipaystate != null">
-        #{alipaystate,jdbcType=INTEGER},
-      </if>
-      <if test="platformpartnerid != null">
-        #{platformpartnerid,jdbcType=VARCHAR},
-      </if>
-      <if test="partnerid != null">
-        #{partnerid,jdbcType=INTEGER},
-      </if>
-      <if test="platformbuyeruserid != null">
-        #{platformbuyeruserid,jdbcType=VARCHAR},
-      </if>
-      <if test="platform != null">
-        #{platform,jdbcType=VARCHAR},
-      </if>
-      <if test="mcoupon != null">
-        #{mcoupon,jdbcType=DECIMAL},
-      </if>
-      <if test="businessdate != null">
-        #{businessdate,jdbcType=VARCHAR},
-      </if>
-      <if test="orginalpayid != null">
-        #{orginalpayid,jdbcType=BIGINT},
-      </if>
-      <if test="pcoupon != null">
-        #{pcoupon,jdbcType=DECIMAL},
-      </if>
-      <if test="liquidatorcommissionrate != null">
-        #{liquidatorcommissionrate,jdbcType=DECIMAL},
-      </if>
-      <if test="liquidatorcommissionfee != null">
-        #{liquidatorcommissionfee,jdbcType=DECIMAL},
-      </if>
-      <if test="bankcommissionfee != null">
-        #{bankcommissionfee,jdbcType=DECIMAL},
-      </if>
-      <if test="bankcommissionrate != null">
-        #{bankcommissionrate,jdbcType=DECIMAL},
-      </if>
-      <if test="payplatformrate != null">
-        #{payplatformrate,jdbcType=DECIMAL},
-      </if>
-      <if test="payplatformfee != null">
-        #{payplatformfee,jdbcType=DECIMAL},
-      </if>
-      <if test="netamount != null">
-        #{netamount,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.freemud.pay.job.dao.dbModel.PayDM">
-    update Pay
-    <set>
-      <if test="storeId != null">
-        Store_Id = #{storeId,jdbcType=VARCHAR},
-      </if>
-      <if test="stationId != null">
-        Station_Id = #{stationId,jdbcType=VARCHAR},
-      </if>
-      <if test="operatorId != null">
-        Operator_Id = #{operatorId,jdbcType=VARCHAR},
-      </if>
-      <if test="partner != null">
-        Partner = #{partner,jdbcType=NVARCHAR},
-      </if>
-      <if test="partneraccount != null">
-        PartnerAccount = #{partneraccount,jdbcType=VARCHAR},
-      </if>
-      <if test="partnerorderid != null">
-        PartnerOrderID = #{partnerorderid,jdbcType=VARCHAR},
-      </if>
-      <if test="platformtradeaccount != null">
-        PlatformTradeAccount = #{platformtradeaccount,jdbcType=VARCHAR},
-      </if>
-      <if test="platformtradenumber != null">
-        PlatformTradeNumber = #{platformtradenumber,jdbcType=VARCHAR},
-      </if>
-      <if test="code != null">
-        Code = #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="amount != null">
-        Amount = #{amount,jdbcType=DECIMAL},
-      </if>
-      <if test="state != null">
-        State = #{state,jdbcType=INTEGER},
-      </if>
-      <if test="subject != null">
-        Subject = #{subject,jdbcType=NVARCHAR},
-      </if>
-      <if test="remark != null">
-        Remark = #{remark,jdbcType=NVARCHAR},
-      </if>
-      <if test="createuser != null">
-        CreateUser = #{createuser,jdbcType=VARCHAR},
-      </if>
-      <if test="createdate != null">
-        CreateDate = #{createdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="canceluser != null">
-        CancelUser = #{canceluser,jdbcType=VARCHAR},
-      </if>
-      <if test="canceldate != null">
-        CancelDate = #{canceldate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="transId != null">
-        Trans_Id = #{transId,jdbcType=VARCHAR},
-      </if>
-      <if test="zhuihuorderid != null">
-        ZhuiHuOrderId = #{zhuihuorderid,jdbcType=VARCHAR},
-      </if>
-      <if test="alipaystate != null">
-        AlipayState = #{alipaystate,jdbcType=INTEGER},
-      </if>
-      <if test="platformpartnerid != null">
-        PlatformPartnerID = #{platformpartnerid,jdbcType=VARCHAR},
-      </if>
-      <if test="partnerid != null">
-        PartnerID = #{partnerid,jdbcType=INTEGER},
-      </if>
-      <if test="platformbuyeruserid != null">
-        PlatformBuyerUserId = #{platformbuyeruserid,jdbcType=VARCHAR},
-      </if>
-      <if test="platform != null">
-        Platform = #{platform,jdbcType=VARCHAR},
-      </if>
-      <if test="mcoupon != null">
-        mcoupon = #{mcoupon,jdbcType=DECIMAL},
-      </if>
-      <if test="businessdate != null">
-        BusinessDate = #{businessdate,jdbcType=VARCHAR},
-      </if>
-      <if test="orginalpayid != null">
-        OrginalPayId = #{orginalpayid,jdbcType=BIGINT},
-      </if>
-      <if test="pcoupon != null">
-        pcoupon = #{pcoupon,jdbcType=DECIMAL},
-      </if>
-      <if test="liquidatorcommissionrate != null">
-        LiquidatorCommissionRate = #{liquidatorcommissionrate,jdbcType=DECIMAL},
-      </if>
-      <if test="liquidatorcommissionfee != null">
-        LiquidatorCommissionFee = #{liquidatorcommissionfee,jdbcType=DECIMAL},
-      </if>
-      <if test="bankcommissionfee != null">
-        BankCommissionFee = #{bankcommissionfee,jdbcType=DECIMAL},
-      </if>
-      <if test="bankcommissionrate != null">
-        BankCommissionRate = #{bankcommissionrate,jdbcType=DECIMAL},
-      </if>
-      <if test="payplatformrate != null">
-        PayPlatformRate = #{payplatformrate,jdbcType=DECIMAL},
-      </if>
-      <if test="payplatformfee != null">
-        PayPlatformFee = #{payplatformfee,jdbcType=DECIMAL},
-      </if>
-      <if test="netamount != null">
-        NetAmount = #{netamount,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where ID = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.freemud.pay.job.dao.dbModel.PayDM">
-    update Pay
-    set Store_Id = #{storeId,jdbcType=VARCHAR},
-      Station_Id = #{stationId,jdbcType=VARCHAR},
-      Operator_Id = #{operatorId,jdbcType=VARCHAR},
-      Partner = #{partner,jdbcType=NVARCHAR},
-      PartnerAccount = #{partneraccount,jdbcType=VARCHAR},
-      PartnerOrderID = #{partnerorderid,jdbcType=VARCHAR},
-      PlatformTradeAccount = #{platformtradeaccount,jdbcType=VARCHAR},
-      PlatformTradeNumber = #{platformtradenumber,jdbcType=VARCHAR},
-      Code = #{code,jdbcType=VARCHAR},
-      Amount = #{amount,jdbcType=DECIMAL},
-      State = #{state,jdbcType=INTEGER},
-      Subject = #{subject,jdbcType=NVARCHAR},
-      Remark = #{remark,jdbcType=NVARCHAR},
-      CreateUser = #{createuser,jdbcType=VARCHAR},
-      CreateDate = #{createdate,jdbcType=TIMESTAMP},
-      CancelUser = #{canceluser,jdbcType=VARCHAR},
-      CancelDate = #{canceldate,jdbcType=TIMESTAMP},
-      Trans_Id = #{transId,jdbcType=VARCHAR},
-      ZhuiHuOrderId = #{zhuihuorderid,jdbcType=VARCHAR},
-      AlipayState = #{alipaystate,jdbcType=INTEGER},
-      PlatformPartnerID = #{platformpartnerid,jdbcType=VARCHAR},
-      PartnerID = #{partnerid,jdbcType=INTEGER},
-      PlatformBuyerUserId = #{platformbuyeruserid,jdbcType=VARCHAR},
-      Platform = #{platform,jdbcType=VARCHAR},
-      mcoupon = #{mcoupon,jdbcType=DECIMAL},
-      BusinessDate = #{businessdate,jdbcType=VARCHAR},
-      OrginalPayId = #{orginalpayid,jdbcType=BIGINT},
-      pcoupon = #{pcoupon,jdbcType=DECIMAL},
-      LiquidatorCommissionRate = #{liquidatorcommissionrate,jdbcType=DECIMAL},
-      LiquidatorCommissionFee = #{liquidatorcommissionfee,jdbcType=DECIMAL},
-      BankCommissionFee = #{bankcommissionfee,jdbcType=DECIMAL},
-      BankCommissionRate = #{bankcommissionrate,jdbcType=DECIMAL},
-      PayPlatformRate = #{payplatformrate,jdbcType=DECIMAL},
-      PayPlatformFee = #{payplatformfee,jdbcType=DECIMAL},
-      NetAmount = #{netamount,jdbcType=DECIMAL}
-    where ID = #{id,jdbcType=BIGINT}
-  </update>
+
 </mapper>
\ No newline at end of file

freemud-pay-module/freemud-pay-push-message/src/main/resources/mapper/PayMessageActiveDMMapper.xml

@@ -35,312 +35,10 @@
     CreateDate, CreateUser, LastEditDate, LastEditUser, IntervalLimit, DateIntervalLimit, 
     MaxAmountLimit, DelayTimeLimit, SecondActiveId, WXMsgActiveId
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from Pay_Message_Active
-    where ID = #{id,jdbcType=BIGINT}
-  </select>
+
   <select id="getPayMessageActiveDM" parameterType="map" resultMap="BaseResultMap">
     SELECT TOP 1000 [ID],[PartnerId],[CouponActiveId],[Name],[Description],[PlatformAccountId],[TemplateId],[Status],[StartTime],[EndTime]
 ,[Scope],[Area],[AmountLimit],[Platform],[Action],[Priority],[CreateDate],[CreateUser],[LastEditDate],[LastEditUser],[WXMsgActiveId]
   FROM [Freemud_ThirdParty].[dbo].[Pay_Message_Active] with(nolock) where ID=#{activeId}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from Pay_Message_Active
-    where ID = #{id,jdbcType=BIGINT}
-  </delete>
-  <insert id="insert" parameterType="com.freemud.pay.job.dao.dbModel.PayMessageActiveDM">
-    insert into Pay_Message_Active (ID, PartnerId, CouponActiveId, 
-      Name, Description, PlatformAccountId, 
-      TemplateId, Status, StartTime, 
-      EndTime, Scope, Area, 
-      AmountLimit, Platform, Action, 
-      Priority, CreateDate, CreateUser, 
-      LastEditDate, LastEditUser, IntervalLimit, 
-      DateIntervalLimit, MaxAmountLimit, DelayTimeLimit, 
-      SecondActiveId, WXMsgActiveId)
-    values (#{id,jdbcType=BIGINT}, #{partnerid,jdbcType=INTEGER}, #{couponactiveid,jdbcType=INTEGER}, 
-      #{name,jdbcType=NVARCHAR}, #{description,jdbcType=NVARCHAR}, #{platformaccountid,jdbcType=INTEGER}, 
-      #{templateid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{starttime,jdbcType=TIMESTAMP}, 
-      #{endtime,jdbcType=TIMESTAMP}, #{scope,jdbcType=INTEGER}, #{area,jdbcType=INTEGER}, 
-      #{amountlimit,jdbcType=DECIMAL}, #{platform,jdbcType=VARCHAR}, #{action,jdbcType=CHAR}, 
-      #{priority,jdbcType=INTEGER}, #{createdate,jdbcType=TIMESTAMP}, #{createuser,jdbcType=VARCHAR}, 
-      #{lasteditdate,jdbcType=TIMESTAMP}, #{lastedituser,jdbcType=VARCHAR}, #{intervallimit,jdbcType=INTEGER}, 
-      #{dateintervallimit,jdbcType=INTEGER}, #{maxamountlimit,jdbcType=DECIMAL}, #{delaytimelimit,jdbcType=DECIMAL}, 
-      #{secondactiveid,jdbcType=BIGINT}, #{wxmsgactiveid,jdbcType=NVARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.freemud.pay.job.dao.dbModel.PayMessageActiveDM">
-    insert into Pay_Message_Active
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        ID,
-      </if>
-      <if test="partnerid != null">
-        PartnerId,
-      </if>
-      <if test="couponactiveid != null">
-        CouponActiveId,
-      </if>
-      <if test="name != null">
-        Name,
-      </if>
-      <if test="description != null">
-        Description,
-      </if>
-      <if test="platformaccountid != null">
-        PlatformAccountId,
-      </if>
-      <if test="templateid != null">
-        TemplateId,
-      </if>
-      <if test="status != null">
-        Status,
-      </if>
-      <if test="starttime != null">
-        StartTime,
-      </if>
-      <if test="endtime != null">
-        EndTime,
-      </if>
-      <if test="scope != null">
-        Scope,
-      </if>
-      <if test="area != null">
-        Area,
-      </if>
-      <if test="amountlimit != null">
-        AmountLimit,
-      </if>
-      <if test="platform != null">
-        Platform,
-      </if>
-      <if test="action != null">
-        Action,
-      </if>
-      <if test="priority != null">
-        Priority,
-      </if>
-      <if test="createdate != null">
-        CreateDate,
-      </if>
-      <if test="createuser != null">
-        CreateUser,
-      </if>
-      <if test="lasteditdate != null">
-        LastEditDate,
-      </if>
-      <if test="lastedituser != null">
-        LastEditUser,
-      </if>
-      <if test="intervallimit != null">
-        IntervalLimit,
-      </if>
-      <if test="dateintervallimit != null">
-        DateIntervalLimit,
-      </if>
-      <if test="maxamountlimit != null">
-        MaxAmountLimit,
-      </if>
-      <if test="delaytimelimit != null">
-        DelayTimeLimit,
-      </if>
-      <if test="secondactiveid != null">
-        SecondActiveId,
-      </if>
-      <if test="wxmsgactiveid != null">
-        WXMsgActiveId,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="partnerid != null">
-        #{partnerid,jdbcType=INTEGER},
-      </if>
-      <if test="couponactiveid != null">
-        #{couponactiveid,jdbcType=INTEGER},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=NVARCHAR},
-      </if>
-      <if test="description != null">
-        #{description,jdbcType=NVARCHAR},
-      </if>
-      <if test="platformaccountid != null">
-        #{platformaccountid,jdbcType=INTEGER},
-      </if>
-      <if test="templateid != null">
-        #{templateid,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="starttime != null">
-        #{starttime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="endtime != null">
-        #{endtime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="scope != null">
-        #{scope,jdbcType=INTEGER},
-      </if>
-      <if test="area != null">
-        #{area,jdbcType=INTEGER},
-      </if>
-      <if test="amountlimit != null">
-        #{amountlimit,jdbcType=DECIMAL},
-      </if>
-      <if test="platform != null">
-        #{platform,jdbcType=VARCHAR},
-      </if>
-      <if test="action != null">
-        #{action,jdbcType=CHAR},
-      </if>
-      <if test="priority != null">
-        #{priority,jdbcType=INTEGER},
-      </if>
-      <if test="createdate != null">
-        #{createdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createuser != null">
-        #{createuser,jdbcType=VARCHAR},
-      </if>
-      <if test="lasteditdate != null">
-        #{lasteditdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="lastedituser != null">
-        #{lastedituser,jdbcType=VARCHAR},
-      </if>
-      <if test="intervallimit != null">
-        #{intervallimit,jdbcType=INTEGER},
-      </if>
-      <if test="dateintervallimit != null">
-        #{dateintervallimit,jdbcType=INTEGER},
-      </if>
-      <if test="maxamountlimit != null">
-        #{maxamountlimit,jdbcType=DECIMAL},
-      </if>
-      <if test="delaytimelimit != null">
-        #{delaytimelimit,jdbcType=DECIMAL},
-      </if>
-      <if test="secondactiveid != null">
-        #{secondactiveid,jdbcType=BIGINT},
-      </if>
-      <if test="wxmsgactiveid != null">
-        #{wxmsgactiveid,jdbcType=NVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.freemud.pay.job.dao.dbModel.PayMessageActiveDM">
-    update Pay_Message_Active
-    <set>
-      <if test="partnerid != null">
-        PartnerId = #{partnerid,jdbcType=INTEGER},
-      </if>
-      <if test="couponactiveid != null">
-        CouponActiveId = #{couponactiveid,jdbcType=INTEGER},
-      </if>
-      <if test="name != null">
-        Name = #{name,jdbcType=NVARCHAR},
-      </if>
-      <if test="description != null">
-        Description = #{description,jdbcType=NVARCHAR},
-      </if>
-      <if test="platformaccountid != null">
-        PlatformAccountId = #{platformaccountid,jdbcType=INTEGER},
-      </if>
-      <if test="templateid != null">
-        TemplateId = #{templateid,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        Status = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="starttime != null">
-        StartTime = #{starttime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="endtime != null">
-        EndTime = #{endtime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="scope != null">
-        Scope = #{scope,jdbcType=INTEGER},
-      </if>
-      <if test="area != null">
-        Area = #{area,jdbcType=INTEGER},
-      </if>
-      <if test="amountlimit != null">
-        AmountLimit = #{amountlimit,jdbcType=DECIMAL},
-      </if>
-      <if test="platform != null">
-        Platform = #{platform,jdbcType=VARCHAR},
-      </if>
-      <if test="action != null">
-        Action = #{action,jdbcType=CHAR},
-      </if>
-      <if test="priority != null">
-        Priority = #{priority,jdbcType=INTEGER},
-      </if>
-      <if test="createdate != null">
-        CreateDate = #{createdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createuser != null">
-        CreateUser = #{createuser,jdbcType=VARCHAR},
-      </if>
-      <if test="lasteditdate != null">
-        LastEditDate = #{lasteditdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="lastedituser != null">
-        LastEditUser = #{lastedituser,jdbcType=VARCHAR},
-      </if>
-      <if test="intervallimit != null">
-        IntervalLimit = #{intervallimit,jdbcType=INTEGER},
-      </if>
-      <if test="dateintervallimit != null">
-        DateIntervalLimit = #{dateintervallimit,jdbcType=INTEGER},
-      </if>
-      <if test="maxamountlimit != null">
-        MaxAmountLimit = #{maxamountlimit,jdbcType=DECIMAL},
-      </if>
-      <if test="delaytimelimit != null">
-        DelayTimeLimit = #{delaytimelimit,jdbcType=DECIMAL},
-      </if>
-      <if test="secondactiveid != null">
-        SecondActiveId = #{secondactiveid,jdbcType=BIGINT},
-      </if>
-      <if test="wxmsgactiveid != null">
-        WXMsgActiveId = #{wxmsgactiveid,jdbcType=NVARCHAR},
-      </if>
-    </set>
-    where ID = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.freemud.pay.job.dao.dbModel.PayMessageActiveDM">
-    update Pay_Message_Active
-    set PartnerId = #{partnerid,jdbcType=INTEGER},
-      CouponActiveId = #{couponactiveid,jdbcType=INTEGER},
-      Name = #{name,jdbcType=NVARCHAR},
-      Description = #{description,jdbcType=NVARCHAR},
-      PlatformAccountId = #{platformaccountid,jdbcType=INTEGER},
-      TemplateId = #{templateid,jdbcType=VARCHAR},
-      Status = #{status,jdbcType=INTEGER},
-      StartTime = #{starttime,jdbcType=TIMESTAMP},
-      EndTime = #{endtime,jdbcType=TIMESTAMP},
-      Scope = #{scope,jdbcType=INTEGER},
-      Area = #{area,jdbcType=INTEGER},
-      AmountLimit = #{amountlimit,jdbcType=DECIMAL},
-      Platform = #{platform,jdbcType=VARCHAR},
-      Action = #{action,jdbcType=CHAR},
-      Priority = #{priority,jdbcType=INTEGER},
-      CreateDate = #{createdate,jdbcType=TIMESTAMP},
-      CreateUser = #{createuser,jdbcType=VARCHAR},
-      LastEditDate = #{lasteditdate,jdbcType=TIMESTAMP},
-      LastEditUser = #{lastedituser,jdbcType=VARCHAR},
-      IntervalLimit = #{intervallimit,jdbcType=INTEGER},
-      DateIntervalLimit = #{dateintervallimit,jdbcType=INTEGER},
-      MaxAmountLimit = #{maxamountlimit,jdbcType=DECIMAL},
-      DelayTimeLimit = #{delaytimelimit,jdbcType=DECIMAL},
-      SecondActiveId = #{secondactiveid,jdbcType=BIGINT},
-      WXMsgActiveId = #{wxmsgactiveid,jdbcType=NVARCHAR}
-    where ID = #{id,jdbcType=BIGINT}
-  </update>
 </mapper>
\ No newline at end of file

freemud-pay-module/freemud-pay-push-message/src/main/resources/mapper/PayMessageDMMapper.xml

@@ -18,151 +18,9 @@
     Id, PartnerId, FMId, TemplateId, UserId, Status, TryTimes, CreateDate, LastEditDate, 
     Code, Pay_Message_Active_ID
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from Pay_Message
-    where Id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from Pay_Message
-    where Id = #{id,jdbcType=BIGINT}
-  </delete>
-  <insert id="insert" parameterType="com.freemud.pay.job.dao.dbModel.PayMessageDM">
-    insert into Pay_Message (Id, PartnerId, FMId, 
-      TemplateId, UserId, Status, 
-      TryTimes, CreateDate, LastEditDate, 
-      Code, Pay_Message_Active_ID)
-    values (#{id,jdbcType=BIGINT}, #{partnerid,jdbcType=INTEGER}, #{fmid,jdbcType=VARCHAR}, 
-      #{templateid,jdbcType=VARCHAR}, #{userid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
-      #{trytimes,jdbcType=INTEGER}, #{createdate,jdbcType=TIMESTAMP}, #{lasteditdate,jdbcType=TIMESTAMP}, 
-      #{code,jdbcType=CHAR}, #{payMessageActiveId,jdbcType=BIGINT})
-  </insert>
-  <insert id="insertSelective" parameterType="com.freemud.pay.job.dao.dbModel.PayMessageDM">
-    insert into Pay_Message
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        Id,
-      </if>
-      <if test="partnerid != null">
-        PartnerId,
-      </if>
-      <if test="fmid != null">
-        FMId,
-      </if>
-      <if test="templateid != null">
-        TemplateId,
-      </if>
-      <if test="userid != null">
-        UserId,
-      </if>
-      <if test="status != null">
-        Status,
-      </if>
-      <if test="trytimes != null">
-        TryTimes,
-      </if>
-      <if test="createdate != null">
-        CreateDate,
-      </if>
-      <if test="lasteditdate != null">
-        LastEditDate,
-      </if>
-      <if test="code != null">
-        Code,
-      </if>
-      <if test="payMessageActiveId != null">
-        Pay_Message_Active_ID,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="partnerid != null">
-        #{partnerid,jdbcType=INTEGER},
-      </if>
-      <if test="fmid != null">
-        #{fmid,jdbcType=VARCHAR},
-      </if>
-      <if test="templateid != null">
-        #{templateid,jdbcType=VARCHAR},
-      </if>
-      <if test="userid != null">
-        #{userid,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="trytimes != null">
-        #{trytimes,jdbcType=INTEGER},
-      </if>
-      <if test="createdate != null">
-        #{createdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="lasteditdate != null">
-        #{lasteditdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="code != null">
-        #{code,jdbcType=CHAR},
-      </if>
-      <if test="payMessageActiveId != null">
-        #{payMessageActiveId,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.freemud.pay.job.dao.dbModel.PayMessageDM">
-    update Pay_Message
-    <set>
-      <if test="partnerid != null">
-        PartnerId = #{partnerid,jdbcType=INTEGER},
-      </if>
-      <if test="fmid != null">
-        FMId = #{fmid,jdbcType=VARCHAR},
-      </if>
-      <if test="templateid != null">
-        TemplateId = #{templateid,jdbcType=VARCHAR},
-      </if>
-      <if test="userid != null">
-        UserId = #{userid,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        Status = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="trytimes != null">
-        TryTimes = #{trytimes,jdbcType=INTEGER},
-      </if>
-      <if test="createdate != null">
-        CreateDate = #{createdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="lasteditdate != null">
-        LastEditDate = #{lasteditdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="code != null">
-        Code = #{code,jdbcType=CHAR},
-      </if>
-      <if test="payMessageActiveId != null">
-        Pay_Message_Active_ID = #{payMessageActiveId,jdbcType=BIGINT},
-      </if>
-    </set>
-    where Id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.freemud.pay.job.dao.dbModel.PayMessageDM">
-    update Pay_Message
-    set PartnerId = #{partnerid,jdbcType=INTEGER},
-      FMId = #{fmid,jdbcType=VARCHAR},
-      TemplateId = #{templateid,jdbcType=VARCHAR},
-      UserId = #{userid,jdbcType=VARCHAR},
-      Status = #{status,jdbcType=INTEGER},
-      TryTimes = #{trytimes,jdbcType=INTEGER},
-      CreateDate = #{createdate,jdbcType=TIMESTAMP},
-      LastEditDate = #{lasteditdate,jdbcType=TIMESTAMP},
-      Code = #{code,jdbcType=CHAR},
-      Pay_Message_Active_ID = #{payMessageActiveId,jdbcType=BIGINT}
-    where Id = #{id,jdbcType=BIGINT}
-  </update>
 
   <select id="getPayMessages" parameterType="Map" resultMap="BaseResultMap">
+      <![CDATA[
     SELECT TOP 1000
     a.[Id] ,
     a.[PartnerId] ,
@@ -186,14 +44,14 @@
     FROM [Freemud_ThirdParty].[dbo].[Pay_Message] a WITH ( NOLOCK )
     INNER JOIN ${linkServer}zhuihu.dbo.Pay p WITH ( NOLOCK ) ON a.FMId = p.ZhuiHuOrderId
     INNER JOIN zhuihu.dbo.[Partner] part WITH(NOLOCK) ON part.ID=a.PartnerId
-    where a.Status in(-1,0) and a.TryTimes &lt; 3 and a.LastEditDate &gt; DATEADD(minute,-30,getdate())
-    <if test="dbPartition != null">
-      AND part.ID = ${dbPartition,jdbcType=VARCHAR},
-    </if>
+
+    ]]>
   </select>
+
   <update id="updateMessageStatus">
-    update top(1) [Freemud_ThirdParty].[dbo].[Pay_Message] set status=#{status} ,TryTimes=TryTimes+1 where id=#{id}
+    update top(1) [Freemud_ThirdParty].[dbo].[Pay_Message] set Status=#{status} ,TryTimes=TryTimes+1 where id=#{id}
   </update>
+
   <update id="updateMessageTryTimes">
     update top(1) [Freemud_ThirdParty].[dbo].[Pay_Message] set TryTimes=#{TryTimes} where id=#{id}
   </update>