订单数据接口

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

@@ -10,6 +10,7 @@ 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 org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -17,6 +18,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+@Service
 public class SalesDetailServiceImpl implements SalesDetailService {
 
     private static Log logger = LogFactory.getLog(SalesDetailService.class);
@@ -30,11 +32,8 @@ public class SalesDetailServiceImpl implements SalesDetailService {
         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("startTime",date + " " +"00:00:00");
+        params.put("endTime",date+ " " +"23:59:59");
         params.put("isOnfiilineOrder","1");
         List<NewSystemFormatEntiy> dtoList = salesDetailMapper.querySalesSystemFormatList(params);
         pushDateEccs(dtoList);
@@ -69,7 +68,7 @@ public class SalesDetailServiceImpl implements SalesDetailService {
                 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)) {
+                    if (kmallMsg.get("code").equals("200")) {
                         bean.setSalesDetStatus("1");
                     } else {
                         bean.setSalesDetStatus("2");
@@ -90,8 +89,8 @@ public class SalesDetailServiceImpl implements SalesDetailService {
         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"));
+        params.put("startTime",date + " " +"00:00:00");
+        params.put("endTime",date+ " " +"23:59:59");
         List<NewSystemFormatEntiy> dtoList = salesDetailMapper.querySalesAgain(params);
         pushDateEccs(dtoList);
 

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

@@ -4,11 +4,17 @@ 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.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
 
 /**
  * 线下订单数据推送接口
  */
+@Component("salsDetailTask")
+@EnableScheduling
+@EnableAsync
 public class SalsDetailTask {
     private static Log logger = LogFactory.getLog(SalsDetailTask.class);
 
@@ -18,7 +24,7 @@ public class SalsDetailTask {
     /**
      * 每天向eccs推送销售明细数据
      */
-    @Scheduled(cron = "0/10 * * * * ?")
+    @Scheduled(cron = "0/30 * * * * ?")
     public void pushSalesDetailData() {
         logger.info(">>>>>>>>>>>>>>>>>>>>pushSalesDetailData is start ");
         salesDetailService.pushSalesDetailData();
@@ -28,7 +34,7 @@ public class SalsDetailTask {
     /**
      * 每天向eccs重推销售明细数据
      */
-    @Scheduled(cron = "0/10 * * * * ?")
+    @Scheduled(cron = "0/30 * * * * ?")
     public void pushSalesDetailDataAgain() {
         logger.info(">>>>>>>>>>>>>>>>>>>>pushSalesDetailDataAgain is start ");
         salesDetailService.pushSalesDetailDataAgain();

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

@@ -85,7 +85,7 @@
         g.goods_id,
         o.order_sn as receiptNo,
         u.username as cashRegisterNo,
-        mor.create_time as timeStampDetails,
+        mor.refund_time as timeStampDetails,
         u.username as staffID,
         u.username as staffName,
         gs.hs_code as hsCode,
@@ -304,7 +304,7 @@
             det_date > STR_TO_DATE(#{startTime}, '%Y-%m-%d %H:%i:%s')
         </if>
         <if test="endTime != null and endTime != ''">
-            AND time_stamp &lt;= STR_TO_DATE(#{endTime}, '%Y-%m-%d %H:%i:%s')
+            AND det_date &lt;= STR_TO_DATE(#{endTime}, '%Y-%m-%d %H:%i:%s')
         </if>
             AND det_status = 2
     </select>