update:pc报表查询

fengliang
1 parent fa0dbc71
Showing 10 changed files with 215 additions and 10 deletions
etrade-core/src/main/java/com/diligrp/etrade/core/jackson/serializer/WeightK2JJsonSerializer.java
etrade-order/doc/job配置.txt
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderController.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderQueryDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/xreport/BusinessFlowCO.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/xreport/BusinessFlowVO.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderQueryServiceImpl.java
scripts/etrade-coupon/etrade_coupon_conf.txt
scripts/etrade-sentinel/etrade_sentinel_conf.txt
@@ -20,7 +20,7 @@ public class WeightK2JJsonSerializer extends JsonSerializer&lt;Long&gt; {
         if(null == value){
             return;
         }
-        BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(500),new MathContext(20,RoundingMode.HALF_UP));
+        BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(100),new MathContext(20,RoundingMode.HALF_UP));
         DecimalFormat df = new DecimalFormat("#0.###");
         gen.writeString(df.format(ans.doubleValue()));
@@ -3,5 +3,5 @@
     调度类型：CRON
     Cron：0 0/5 * * * ?
     运行模式：BEAN
-    JobHandler：cancelOrderOutTime
+    JobHandler：xtradeCancelOrderOutTime
     任务参数：无
 \ No newline at end of file
@@ -813,6 +813,7 @@ public class OrderController {
             ConfigQueryDto query = new ConfigQueryDto();
             query.setName("甄选运费");
             query.setMarketId(order.getMarketId());
+            query.setType("TransportFee");
             BaseOutput<List<ConfigDto>> listBaseOutput = basicDataConfigRpc.queryAll(query);
             if("200".equals(listBaseOutput.getCode())){
                 List<ConfigDto> configDtos = listBaseOutput.getData();
@@ -240,7 +240,7 @@ public class OrderDto {
     /** 订单配送状态 */
     private Integer achieveState;
     /** 运费 */
-    private Long transportFee;
+    private BigDecimal transportFee;
     public Integer getAchieveType() {
         return achieveType;
@@ -317,6 +317,14 @@ public class OrderDto {
      * 关联订单id
      */
     private Long relationId;
+    /** 订单收货人姓名 */
+    private String receiverName;
+    /** 订单收货人电话 */
+    private String receiverPhone;
+    /** 订单收货人地址 */
+    private String address;
+    /** 配送方式 */
+    private String wayType;
     public BigDecimal getTotleSellerFee() {
         return totleSellerFee;
@@ -720,11 +728,11 @@ public class OrderDto {
         this.relationId = relationId;
     }
-    public Long getTransportFee() {
+    public BigDecimal getTransportFee() {
         return transportFee;
     }
-    public void setTransportFee(Long transportFee) {
+    public void setTransportFee(BigDecimal transportFee) {
         this.transportFee = transportFee;
     }
@@ -735,4 +743,36 @@ public class OrderDto {
     public void setLocation(String location) {
         this.location = location;
     }
+
+    public String getReceiverName() {
+        return receiverName;
+    }
+
+    public void setReceiverName(String receiverName) {
+        this.receiverName = receiverName;
+    }
+
+    public String getReceiverPhone() {
+        return receiverPhone;
+    }
+
+    public void setReceiverPhone(String receiverPhone) {
+        this.receiverPhone = receiverPhone;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getWayType() {
+        return wayType;
+    }
+
+    public void setWayType(String wayType) {
+        this.wayType = wayType;
+    }
 }
@@ -64,6 +64,11 @@ public class OrderQueryDto extends BasePageQuery {
     /** 支付结束时间 */
     private LocalDateTime payEndTime;
+    /** 更新开始时间 */
+    private LocalDateTime modifyTimeStart;
+
+    /** 更新结束 */
+    private LocalDateTime modifyTimeEnd;
     private Integer verifyState;
@@ -232,4 +237,20 @@ public class OrderQueryDto extends BasePageQuery {
     public void setAchieveState(Integer achieveState) {
         this.achieveState = achieveState;
     }
+
+    public LocalDateTime getModifyTimeStart() {
+        return modifyTimeStart;
+    }
+
+    public void setModifyTimeStart(LocalDateTime modifyTimeStart) {
+        this.modifyTimeStart = modifyTimeStart;
+    }
+
+    public LocalDateTime getModifyTimeEnd() {
+        return modifyTimeEnd;
+    }
+
+    public void setModifyTimeEnd(LocalDateTime modifyTimeEnd) {
+        this.modifyTimeEnd = modifyTimeEnd;
+    }
 }
@@ -42,6 +42,13 @@ public class BusinessFlowCO extends ClientPageQueryCO implements Serializable {
      */
     private Long source;
+    /** 订单状态 */
+    private Integer state;
+    /** 订单状态 */
+    private Integer verifyState;
+    /** 订单状态 */
+    private Integer achieveState;
+
     /**
      * 开始时间
      */
@@ -52,10 +59,16 @@ public class BusinessFlowCO extends ClientPageQueryCO implements Serializable {
      */
     private LocalDateTime startSettleDateTime;
+    /** 更新开始时间 */
+    private LocalDateTime modifyTimeStart;
+
+    /** 更新结束 */
+    private LocalDateTime modifyTimeEnd;
+
     /**
      *市场id
      */
-    @NotNull
+    @NotNull(message = "市场不能为空")
     private Long marketId;
     public List<Long> getProducts() {
@@ -137,4 +150,44 @@ public class BusinessFlowCO extends ClientPageQueryCO implements Serializable {
     public void setMarketId(Long marketId) {
         this.marketId = marketId;
     }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getVerifyState() {
+        return verifyState;
+    }
+
+    public void setVerifyState(Integer verifyState) {
+        this.verifyState = verifyState;
+    }
+
+    public Integer getAchieveState() {
+        return achieveState;
+    }
+
+    public void setAchieveState(Integer achieveState) {
+        this.achieveState = achieveState;
+    }
+
+    public LocalDateTime getModifyTimeStart() {
+        return modifyTimeStart;
+    }
+
+    public void setModifyTimeStart(LocalDateTime modifyTimeStart) {
+        this.modifyTimeStart = modifyTimeStart;
+    }
+
+    public LocalDateTime getModifyTimeEnd() {
+        return modifyTimeEnd;
+    }
+
+    public void setModifyTimeEnd(LocalDateTime modifyTimeEnd) {
+        this.modifyTimeEnd = modifyTimeEnd;
+    }
 }
@@ -108,14 +108,40 @@ public class BusinessFlowVO implements Serializable {
      */
     private String sellerCode;
     /**
+     * 店铺名称
+     */
+    private String shopName;
+    /**
      * 卖家卡号
      */
     private String sellerCardNo;
+    /**
+     * 商品单位
+     */
+    private String productUint;
+    /**
+     * 收货人
+     */
+    private String receiverName;
+    /**
+     * 收货人电话
+     */
+    private String receiverPhone;
+    /**
+     * 收货人地址
+     */
+    private String address;
     /**
      * 卖方店员名称
      */
     private String sellerName;
+    /** 核销状态（1待核销，2已核销，0无需核销） */
+    private Integer verifyState;
+    /** 配送状态（1待配送，2配送中，3已收货）  */
+    private Integer achieveState;
+    /** 送达类型（1自提，2配送） */
+    private Integer achieveType;
     public Long getId() {
         return id;
@@ -284,4 +310,68 @@ public class BusinessFlowVO implements Serializable {
     public void setProductSellerFee(Long productSellerFee) {
         this.productSellerFee = productSellerFee;
     }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getProductUint() {
+        return productUint;
+    }
+
+    public void setProductUint(String productUint) {
+        this.productUint = productUint;
+    }
+
+    public String getReceiverName() {
+        return receiverName;
+    }
+
+    public void setReceiverName(String receiverName) {
+        this.receiverName = receiverName;
+    }
+
+    public String getReceiverPhone() {
+        return receiverPhone;
+    }
+
+    public void setReceiverPhone(String receiverPhone) {
+        this.receiverPhone = receiverPhone;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public Integer getVerifyState() {
+        return verifyState;
+    }
+
+    public void setVerifyState(Integer verifyState) {
+        this.verifyState = verifyState;
+    }
+
+    public Integer getAchieveState() {
+        return achieveState;
+    }
+
+    public void setAchieveState(Integer achieveState) {
+        this.achieveState = achieveState;
+    }
+
+    public Integer getAchieveType() {
+        return achieveType;
+    }
+
+    public void setAchieveType(Integer achieveType) {
+        this.achieveType = achieveType;
+    }
 }
@@ -123,7 +123,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
     @Override
     public BusinessFlowPageMessage<BusinessFlowVO> businessFlow(BusinessFlowCO co) {
-        PageHelper.startPage(co.getPageNo(), co.getPageSize());
+        PageHelper.startPage(co.getPageNo()==null?1:co.getPageNo(), co.getPageSize()==null?10:co.getPageSize());
         List<BusinessFlowVO> list = orderQueryMapper.queryBusinessFlow(co);
         BusinessFlowSumVO sumFlowVO = orderQueryMapper.querySumBusinessFlow(co);
 //        list.forEach(e->{
@@ -12,7 +12,7 @@
    任务配置
    运行模式* BEAN
-   JobHandler* templateJobHandler
+   JobHandler* xtradeTemplateJobHandler
 2、优惠劵有效期定时任务
   执行器* 电子交易结算
@@ -26,7 +26,7 @@
   任务配置
   运行模式* BEAN
-  JobHandler* couponJobHandler
+  JobHandler* xtradeCouponJobHandler
 3、新增用户发放优惠劵
   基础数据中心
@@ -3,5 +3,5 @@
         调度类型：CRON
         Cron：0 1,10 0 * * ?
         运行模式：BEAN
-        JobHandler：productExpiryJobHandler
+        JobHandler：xtradeProductExpiryJobHandler
         任务参数：-1
 \ No newline at end of file