FamilyMarkLanternSender

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

@@ -45,9 +45,6 @@ public class PayMessageServiceImpl implements IPayMessageService {
     @Autowired
     IPayMessageActiveService iPayMessageActiveService;
 
-    @Autowired
-    private SpringUtil springUtil;
-
     @Override
     public void pushMessage(BaseParam baseParam) {
 
@@ -88,7 +85,7 @@ public class PayMessageServiceImpl implements IPayMessageService {
 
             try
             {
-                IMessageProcessor processor = MessageProcessorFactory.GetMessageProcessor(message, active);
+                IMessageProcessor processor = MessageProcessorFactory.GetMessageProcessor(active);
 
                 PayMessage payMessage=new PayMessage();
                 payMessage.setBaseParam(baseParam);

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

@@ -41,12 +41,6 @@ public class PayPlatformAccountServiceImpl implements IPayPlatformAccountService
     @Autowired
     IPayMessageService iPayMessageService;
 
-    @Autowired
-    IPayPlatformAccountService iPayPlatformAccountService;
-
-
-
-
     @Override
     public PayPlatformAccountDM getPayPlatformAccount(PayMessage payMessage,String platform) {
         EncryptionHelper encryptionHelper = new EncryptionHelper();

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

 package com.freemud.pay.job.service.processorfactory;
 
+import com.alipay.api.AlipayApiException;
 import com.freemud.pay.job.entity.PayMessage;
 import org.springframework.stereotype.Service;
 
@@ -15,5 +16,5 @@ import org.springframework.stereotype.Service;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 public interface IMessageProcessor {
-    Boolean Process(PayMessage payMessage);
+    Boolean Process(PayMessage payMessage) throws AlipayApiException;
 }

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

@@ -3,6 +3,7 @@ package com.freemud.pay.job.service.processorfactory;
 import com.freemud.pay.job.dao.dbModel.PayMessageActiveDM;
 import com.freemud.pay.job.dao.dbModel.PayMessageDM;
 import com.freemud.pay.job.service.processorfactory.processimpl.AliFuWuChuangSingleMessageSender;
+import com.freemud.pay.job.service.processorfactory.processimpl.FamilyMarkLanternSender;
 import com.freemud.pay.job.service.util.SpringUtil;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -23,7 +24,7 @@ public class MessageProcessorFactory {
 
     protected static final Logger logger = LoggerFactory.getLogger(MessageProcessorFactory.class);
 
-    public static IMessageProcessor GetMessageProcessor(PayMessageDM messasge, PayMessageActiveDM active)
+    public static IMessageProcessor GetMessageProcessor( PayMessageActiveDM active)
     {
         if (active == null
                 ||  StringUtils.isEmpty(active.getAction()))
@@ -32,10 +33,19 @@ public class MessageProcessorFactory {
             return null;
         }
         String s = active.getAction().toLowerCase();
-        if ("ali.single.send".equals(s)) {
-            return SpringUtil.getBean(AliFuWuChuangSingleMessageSender.class);
-        } else {
-            return null;
+        switch (s){
+            case "ali.single.send":
+                return SpringUtil.getBean(AliFuWuChuangSingleMessageSender.class);
+            case "qj.point.send":
+                return  SpringUtil.getBean(FamilyMarkLanternSender.class);
+                default:
+                return null;
         }
+
+//        if ("ali.single.send".equals(s)) {
+//            return SpringUtil.getBean(AliFuWuChuangSingleMessageSender.class);
+//        } else {
+//            return null;
+//        }
     }
 }
\ No newline at end of file

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

@@ -67,7 +67,6 @@ public class AliFuWuChuangSingleMessageSender implements IMessageProcessor {
 
         PayPlatformAccountDM payPlatformAccountDM = iPayPlatformAccountService.getPayPlatformAccount(payMessage, PayPlatformAccountConstans.PLATFORM_ALI_FWC);
 
-        System.out.println(payPlatformAccountDM.getId());
         if (payPlatformAccountDM == null){
             payMessage.setNoRetry(true);
             logger.info("平台信息为空");

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

@@ -70,11 +70,6 @@ public class InterrprentUtil {
              */
             EncryptionHelper encryptionHelper = new EncryptionHelper();
             String code = payMessage.getPayMessage().getCode().isEmpty()?null:encryptionHelper.Decode(payMessage.getPayMessage().getCode().trim());
-
-
-//                    string.IsNullOrWhiteSpace()
-//                    ? string.Empty
-//                    : new ZhuiHu.Encryption.EncryptionUtility().Decode(context.getPayMessage().Code.Trim());
             ActiveDM couponInfo = iActiveService.selectByPrimaryKey(payMessage.getPayMessageActive().getCouponactiveid());
             templateContent = templateContent.replace("#code#", code)
                     .replace("#validFrom#", dateformat2.format(couponInfo.getStartdate()))
@@ -82,7 +77,6 @@ public class InterrprentUtil {
         }else {
             logger.info("活动券码号为空");
         }
-
         return templateContent;
     }
 

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

@@ -76,7 +76,9 @@
         <!--<table tableName="Pay_Message_Active" domainObjectName="PayMessageActiveDM" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" ></table>-->
         <!--<table tableName="Partner" domainObjectName="PartnerDM" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" ></table>-->
         <!--<table tableName="Pay_PlatformAccount" domainObjectName="PayPlatformAccountDM" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" ></table>-->
-        <table tableName="Active" domainObjectName="ActiveDM" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" ></table>
+        <!--<table tableName="Active" domainObjectName="ActiveDM" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" ></table>-->
+        <table tableName="Partner_Setting" domainObjectName="PartnerSettingDM" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" ></table>
+
 
 
         <!--<table tableName="partner"  domainObjectName="Partner" ></table>

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

@@ -2,7 +2,7 @@
 <configuration debug="false" scan="true" scanPeriod="1 seconds">
 
     <contextName>logback</contextName>
-    <property name="log.path" value="/data/applogs/xxl-job/xxl-job-executor-sample-springboot.log"/>
+    <property name="log.path" value="/data/applogs/xxl-job/freemud-pay-push-message.log"/>
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
        <!-- <filter class="ch.qos.logback.classic.filter.ThresholdFilter" >