diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java index bf058312..27f6540f 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java @@ -10,6 +10,7 @@ import com.xhpc.common.core.utils.bean.BeanUtils; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.GetMapping; import javax.annotation.Resource; import java.util.ArrayList; @@ -31,7 +32,7 @@ public class SyncHistoryOrderTask { /** * 每天六点自动同步一天之前所有未同步订单 */ - @Scheduled(cron = "0 0 6 * * ? ") + @Scheduled(cron = "0 0 0/1 * * ?") @Transactional void ExpiredTenantStatusTask(){ System.out.println(" ============== 自动同步订单到清分 开始 =========================="); diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/OrderTrend.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/OrderTrend.java index 308bb461..12b77bc3 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/OrderTrend.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/OrderTrend.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; +import java.math.BigDecimal; import java.util.List; @NoArgsConstructor @@ -40,6 +41,12 @@ public class OrderTrend { @JsonProperty("orderNumber") private Long orderNumber; + /** + * orderNumber + */ + @JsonProperty("actPrice") + private BigDecimal actPrice; + } } diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java index 6be291ae..ae5de551 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java @@ -17,6 +17,7 @@ import com.xhpc.card.service.XhpcDataBigScreenService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.*; /** @@ -697,7 +698,8 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { for (Map orderTrendMap : orderTrendList) { OrderTrend.DataDTO dataDTO = new OrderTrend.DataDTO(); dataDTO.setTime((String) orderTrendMap.get("current_time")); - dataDTO.setOrderNumber((Long) orderTrendMap.get("sum")); + dataDTO.setOrderNumber((Long) orderTrendMap.get("number")); + dataDTO.setActPrice(new BigDecimal(orderTrendMap.get("actPrice").toString())); orderTrend.getData().add(dataDTO); } orderTrend.setTotalItems((long) orderTrendList.size()); diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index 0a5a77f6..16a29946 100644 --- a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -166,7 +166,8 @@