定时任务迁移

kmall-schedule/src/main/java/com/kmall/schedule/dao/SalesDetailMapper.java → kmall-admin/src/main/java/com/kmall/admin/dao/SalesDetailMapper.java

@@ -1,6 +1,6 @@
-package com.kmall.schedule.dao;
+package com.kmall.admin.dao;
 
-import com.kmall.schedule.entity.NewSystemFormatEntiy;
+import com.kmall.admin.dto.NewSystemFormatEntiy;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

kmall-schedule/src/main/java/com/kmall/schedule/entity/NewSystemFormatEntiy.java → kmall-admin/src/main/java/com/kmall/admin/dto/NewSystemFormatEntiy.java

@@ -1,4 +1,4 @@
-package com.kmall.schedule.entity;
+package com.kmall.admin.dto;
 
 import java.io.Serializable;
 import java.util.Date;

kmall-admin/src/main/java/com/kmall/admin/service/SalesDetailService.java

@@ -0,0 +1,8 @@
+package com.kmall.admin.service;
+
+public interface SalesDetailService {
+
+    public void pushSalesDetailData();
+
+    public void pushSalesDetailDataAgain();
+}

kmall-admin/src/main/java/com/kmall/admin/service/impl/SalesDetailServiceImpl.java

@@ -0,0 +1,101 @@
+package com.kmall.admin.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.kmall.admin.dao.SalesDetailMapper;
+import com.kmall.admin.dto.NewSystemFormatEntiy;
+import com.kmall.admin.service.SalesDetailService;
+import com.kmall.common.constant.Dict;
+import com.kmall.common.utils.DateUtils;
+import com.kmall.common.utils.HttpUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SalesDetailServiceImpl implements SalesDetailService {
+
+    private static Log logger = LogFactory.getLog(SalesDetailService.class);
+
+    @Autowired
+    private SalesDetailMapper salesDetailMapper;
+    /**
+     *向eccs推送销售明细数据
+     */
+    public void pushSalesDetailData() {
+        logger.info(">>>>>>>>>>>>>>>>>>>>pushSalesDetailData is start ");
+        Map<String, Object> params  = new HashMap<>();
+        String date = DateUtils.formatDate(DateUtils.addDate(new Date(),-1),"yyyy-MM-dd");
+        params.put("startTime", DateUtils.getDateAddTime(date,"00:00:00"));
+        params.put("endTime",DateUtils.getDateAddTime(date,"23:59:59"));
+
+//        params.put("startTime", "2021-03-07 00:00:00");
+//        params.put("endTime","2021-03-11 23:59:59");
+        params.put("isOnfiilineOrder","1");
+        List<NewSystemFormatEntiy> dtoList = salesDetailMapper.querySalesSystemFormatList(params);
+        pushDateEccs(dtoList);
+    }
+
+
+    public void pushDateEccs(List<NewSystemFormatEntiy> dtoList) {
+        String valueUrl = salesDetailMapper.querySalesByKey("SALES_DETAIL_DATA_URL");
+
+        if (dtoList.size() > 0) {
+
+            dtoList.forEach(bean ->{
+                BigDecimal unitSold = new BigDecimal(bean.getUnitSold());
+                // 如果是退货
+                String orderStatus = bean.getOrderStatus();
+                if (Dict.orderStatus.item_401.getItem().equals(orderStatus)){
+                    bean.setSaleReturnType("整单退货");
+                    bean.setTransactionType("退货");
+                }else{
+                    bean.setTransactionType("销售");
+                }
+                // 设置综合税额
+                BigDecimal totalSalesIncTax = new BigDecimal(bean.getTotalSalesInclTax());
+                // 设置实际销售额
+                bean.setCurrentPrice(totalSalesIncTax.divide(unitSold,2,BigDecimal.ROUND_HALF_UP).setScale(2,BigDecimal.ROUND_HALF_UP).toEngineeringString());
+                NewSystemFormatEntiy merchMsg = salesDetailMapper.queryMerch(bean.getMerchSn());
+                if(merchMsg!=null){
+                    bean.setThirdMerchSn(merchMsg.getThirdMerchSn());
+                    bean.setThirdMerchSnName(merchMsg.getThirdMerchSnName());
+                    bean.setMerchSnName(merchMsg.getMerchSnName());
+                }
+                String msg = HttpUtil.doPostJson(valueUrl, JSON.toJSONString(bean));
+                if(msg!=null&&!msg.equals("")){
+                    Map<String, Object> kmallMsg = com.alibaba.fastjson.JSONObject.toJavaObject(JSON.parseObject(msg), Map.class);
+                    if (kmallMsg.get("code").equals(200)) {
+                        bean.setSalesDetStatus("1");
+                    } else {
+                        bean.setSalesDetStatus("2");
+                    }
+                    bean.setSalesDetMsg(msg);
+                    salesDetailMapper.writebackSalesDet(bean);
+                }
+            });
+        }
+
+    }
+
+
+    /**
+     * 重推接口
+     */
+    public void pushSalesDetailDataAgain() {
+        logger.info(">>>>>>>>>>>>>>>>>>>>pushSalesDetailDataAgain is start ");
+        Map<String, Object> params  = new HashMap<>();
+        String date = DateUtils.formatDate(DateUtils.addDate(new Date(),-1),"yyyy-MM-dd");
+        params.put("startTime", DateUtils.getDateAddTime(date,"00:00:00"));
+        params.put("endTime",DateUtils.getDateAddTime(date,"23:59:59"));
+        List<NewSystemFormatEntiy> dtoList = salesDetailMapper.querySalesAgain(params);
+        pushDateEccs(dtoList);
+
+
+    }
+
+}

kmall-admin/src/main/java/com/kmall/admin/task/SalsDetailTask.java

@@ -0,0 +1,38 @@
+package com.kmall.admin.task;
+
+import com.kmall.admin.service.SalesDetailService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+
+/**
+ * 线下订单数据推送接口
+ */
+public class SalsDetailTask {
+    private static Log logger = LogFactory.getLog(SalsDetailTask.class);
+
+    @Autowired
+    private SalesDetailService salesDetailService;
+
+    /**
+     * 每天向eccs推送销售明细数据
+     */
+    @Scheduled(cron = "0/10 * * * * ?")
+    public void pushSalesDetailData() {
+        logger.info(">>>>>>>>>>>>>>>>>>>>pushSalesDetailData is start ");
+        salesDetailService.pushSalesDetailData();
+        logger.info(">>>>>>>>>>>>>>>>>>>>pushSalesDetailData is end ");
+    }
+
+    /**
+     * 每天向eccs重推销售明细数据
+     */
+    @Scheduled(cron = "0/10 * * * * ?")
+    public void pushSalesDetailDataAgain() {
+        logger.info(">>>>>>>>>>>>>>>>>>>>pushSalesDetailDataAgain is start ");
+        salesDetailService.pushSalesDetailDataAgain();
+        logger.info(">>>>>>>>>>>>>>>>>>>>pushSalesDetailDataAgain is end ");
+    }
+
+}

kmall-schedule/src/main/resources/mybatis/mapper/SalesDetailMapper.xml → kmall-admin/src/main/resources/mybatis/mapper/SalesDetailMapper.xml

@@ -1,10 +1,10 @@
 <?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.kmall.schedule.dao.SalesDetailMapper">
+<mapper namespace="com.kmall.admin.dao.SalesDetailMapper">
 
 <!--    抓取订单销售明细数据-->
-    <select id="querySalesSystemFormatList" resultType="com.kmall.schedule.entity.NewSystemFormatEntiy">
+    <select id="querySalesSystemFormatList" resultType="com.kmall.admin.dto.NewSystemFormatEntiy">
 
         SELECT distinct
         o.id,
@@ -156,7 +156,7 @@
     </select>
 
     <!--记录推送数据-->
-    <insert id="writebackSalesDet" parameterType="com.kmall.schedule.entity.NewSystemFormatEntiy">
+    <insert id="writebackSalesDet" parameterType="com.kmall.admin.dto.NewSystemFormatEntiy">
         insert into mall_sales_detail_data_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="merchSn != null">merch_sn,</if>
@@ -246,7 +246,7 @@
 	</select>
 
 <!--    查询商户名称和第三方商户信息-->
-    <select id="queryMerch" parameterType="java.lang.String" resultType="com.kmall.schedule.entity.NewSystemFormatEntiy">
+    <select id="queryMerch" parameterType="java.lang.String" resultType="com.kmall.admin.dto.NewSystemFormatEntiy">
         SELECT
             mall.merch_name as merchSnName,
             biz.third_party_merch_code as thirdMerchSn,
@@ -260,7 +260,7 @@
 
 
     <!--数据重推-->
-    <select id="querySalesAgain"  parameterType="java.util.Map" resultType="com.kmall.schedule.entity.NewSystemFormatEntiy">
+    <select id="querySalesAgain"  parameterType="java.util.Map" resultType="com.kmall.admin.dto.NewSystemFormatEntiy">
         SELECT
         merch_sn,
         merch_sn_name,

kmall-common/src/main/java/com/kmall/common/utils/HttpUtil.java

@@ -496,8 +496,6 @@ public class HttpUtil {
     /**
      * @method
      * @description 发送post请求，json参数
-     * @date: 2019/9/10 13:58
-     * @author: 叶静
      * @Param
      * @return
      */

kmall-manager/src/main/resources/conf/redis.properties

@@ -7,6 +7,7 @@ redis.env=prod
 redis.dev.keyPrefix=platform
 redis.dev.host=127.0.0.1
 redis.dev.port=6379
+redis.dev.password=Abc-123#*.-
 redis.dev.pool.maxIdle=200
 redis.dev.pool.maxWait=1000
 redis.dev.pool.maxTotal=10000

kmall-schedule/src/main/java/com/kmall/schedule/quartz/OrderTask.java

@@ -252,25 +252,7 @@ public class OrderTask {
         logger.info(">>>>>>>>>>>>>>>>>>>>updateProductStoreByGoodsShareStock is end ");
     }
 
-    /**
-     * 每天向eccs推送销售明细数据
-     */
-    //@Scheduled(cron = "0/10 * * * * ?")
-    public void pushSalesDetailData() {
-        logger.info(">>>>>>>>>>>>>>>>>>>>pushSalesDetailData is start ");
-        qzOrderService.pushSalesDetailData();
-        logger.info(">>>>>>>>>>>>>>>>>>>>pushSalesDetailData is end ");
-    }
 
-    /**
-     * 每天向eccs重推销售明细数据
-     */
-    //@Scheduled(cron = "0/10 * * * * ?")
-    public void pushSalesDetailDataAgain() {
-        logger.info(">>>>>>>>>>>>>>>>>>>>pushSalesDetailDataAgain is start ");
-        qzOrderService.pushSalesDetailDataAgain();
-        logger.info(">>>>>>>>>>>>>>>>>>>>pushSalesDetailDataAgain is end ");
-    }
 
 
 }

kmall-schedule/src/main/java/com/kmall/schedule/service/QzOrderService.java

@@ -57,8 +57,7 @@ public class QzOrderService {
     private MkDistSellStatisMapper mkDistSellStatisMapper;
     @Autowired
     private ScheduleJobLogDao scheduleJobLogDao;
-    @Autowired
-    private SalesDetailMapper salesDetailMapper;
+
 
     /**
      * todo 一期暂时不实现团购
@@ -1623,80 +1622,7 @@ public class QzOrderService {
 
 
 
-    /**
-     *向eccs推送销售明细数据
-     */
-    public void pushSalesDetailData() {
-        logger.info(">>>>>>>>>>>>>>>>>>>>pushSalesDetailData is start ");
-        Map<String, Object> params  = new HashMap<>();
-        String date = DateUtils.formatDate(DateUtils.addDate(new Date(),-1),"yyyy-MM-dd");
-        params.put("startTime", DateUtils.getDateAddTime(date,"00:00:00"));
-        params.put("endTime",DateUtils.getDateAddTime(date,"23:59:59"));
-
-//        params.put("startTime", "2021-03-07 00:00:00");
-//        params.put("endTime","2021-03-11 23:59:59");
-        params.put("isOnfiilineOrder","1");
-        List<NewSystemFormatEntiy> dtoList = salesDetailMapper.querySalesSystemFormatList(params);
-        pushDateEccs(dtoList);
-    }
-
-
-    public void pushDateEccs(List<NewSystemFormatEntiy> dtoList) {
-        String valueUrl = salesDetailMapper.querySalesByKey("SALES_DETAIL_DATA_URL");
-
-        if (dtoList.size() > 0) {
-
-            dtoList.forEach(bean ->{
-                BigDecimal unitSold = new BigDecimal(bean.getUnitSold());
-                // 如果是退货
-                String orderStatus = bean.getOrderStatus();
-                if (Dict.orderStatus.item_401.getItem().equals(orderStatus)){
-                    bean.setSaleReturnType("整单退货");
-                    bean.setTransactionType("退货");
-                }else{
-                    bean.setTransactionType("销售");
-                }
-                // 设置综合税额
-                BigDecimal totalSalesIncTax = new BigDecimal(bean.getTotalSalesInclTax());
-                // 设置实际销售额
-                bean.setCurrentPrice(totalSalesIncTax.divide(unitSold,2,BigDecimal.ROUND_HALF_UP).setScale(2,BigDecimal.ROUND_HALF_UP).toEngineeringString());
-                NewSystemFormatEntiy merchMsg = salesDetailMapper.queryMerch(bean.getMerchSn());
-                if(merchMsg!=null){
-                    bean.setThirdMerchSn(merchMsg.getThirdMerchSn());
-                    bean.setThirdMerchSnName(merchMsg.getThirdMerchSnName());
-                    bean.setMerchSnName(merchMsg.getMerchSnName());
-                }
-                String msg = HttpUtil.doPostJson(valueUrl, JSON.toJSONString(bean));
-                if(msg!=null&&!msg.equals("")){
-                    Map<String, Object> kmallMsg = com.alibaba.fastjson.JSONObject.toJavaObject(JSON.parseObject(msg), Map.class);
-                    if (kmallMsg.get("code").equals(200)) {
-                        bean.setSalesDetStatus("1");
-                    } else {
-                        bean.setSalesDetStatus("2");
-                    }
-                    bean.setSalesDetMsg(msg);
-                    salesDetailMapper.writebackSalesDet(bean);
-                }
-            });
-        }
-
-    }
-
-
-    /**
-     * 重推接口
-     */
-    public void pushSalesDetailDataAgain() {
-        logger.info(">>>>>>>>>>>>>>>>>>>>pushSalesDetailDataAgain is start ");
-        Map<String, Object> params  = new HashMap<>();
-        String date = DateUtils.formatDate(DateUtils.addDate(new Date(),-1),"yyyy-MM-dd");
-        params.put("startTime", DateUtils.getDateAddTime(date,"00:00:00"));
-        params.put("endTime",DateUtils.getDateAddTime(date,"23:59:59"));
-        List<NewSystemFormatEntiy> dtoList = salesDetailMapper.querySalesAgain(params);
-        pushDateEccs(dtoList);
-
 
-    }