定时作业

ch-dao/src/main/java/com/wwdz/ch/db/dao/distribution/DistributionOrderDao.java

@@ -5,6 +5,7 @@ import com.wwdz.ch.db.domain.distribution.DistributionOrder;
 import com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 public interface DistributionOrderDao {
@@ -81,6 +82,8 @@ public interface DistributionOrderDao {
     List<DistributionOrder> findByPage(DistributionOrderRequestDto dto);
 
 
+    List<DistributionOrder> findList(Date startTime, Date endTime);
+
     /**
      * 统计商品卖出数量
      * @param itemId

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/DistributionOrderRequestDto.java

@@ -132,4 +132,15 @@ public class DistributionOrderRequestDto extends BaseRequestDto implements Entit
      * 退款接口请求秘钥
      */
     private String secret;
+
+    private Date startTime;
+
+    private Date endTime;
+
+    /**
+     * 订单类型
+     * 1 一口价
+     * 2 竞价
+     */
+    private Integer type;
 }

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/DistributionOrderDaoImpl.java

@@ -103,6 +103,19 @@ public class DistributionOrderDaoImpl implements DistributionOrderDao {
         return distributionOrderMapper.selectByExample(example);
     }
 
+    @Override
+    public List<DistributionOrder> findList(Date startTime, Date endTime) {
+        DistributionOrderExample example = new DistributionOrderExample();
+        DistributionOrderExample.Criteria criteria = example.createCriteria();
+        //竞拍
+        criteria.andTypeEqualTo(2);
+        //待付款
+        criteria.andStateEqualTo(1);
+        criteria.andCreateTimeGreaterThanOrEqualTo(startTime);
+        criteria.andCreateTimeLessThanOrEqualTo(endTime);
+        criteria.andPayTimeIsNull();
+        return distributionOrderMapper.selectByExample(example);
+    }
 
     @Override
     public Long countSelledNum(long itemId) {

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java

@@ -627,7 +627,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributionOrderVo.setPayEndTime(time);
                 //查询订单利润
                 DistributorProfit distributorProfit = distributorProfitDao.findByIdOfDistributor(distributionOrder.getDistributionOrderId(), distributionOrder.getSellerId());
-                distributionOrderVo.setProfit(PriceUtil.convertPriceFenToYuan(distributorProfit.getProfit()));
+                if (distributorProfit != null) {
+                    distributionOrderVo.setProfit(PriceUtil.convertPriceFenToYuan(distributorProfit.getProfit()));
+                } else {
+                    distributionOrderVo.setProfit("0");
+                }
                 distributionOrderVoList.add(distributionOrderVo);
             });
             return Result.success(PageSearchResult.of(pageInfo, distributionOrderVoList));