返回拒绝时间

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreBackOrderListVo.java

@@ -34,7 +34,7 @@ public class GoblinStoreBackOrderListVo implements Cloneable {
     private String auditAt;
     @ApiModelProperty(value = "退款完成时间")
     private String refundAt;
-    @ApiModelProperty(value = "处理时间（优先退款完成时间，否则审核时间）")
+    @ApiModelProperty(value = "处理时间（优先退款完成时间，其次审核时间，最后拒绝时间）")
     private String processedAt;
     @ApiModelProperty(value = "退款商品明细")
     private List<GoblinBackOrderSkuVo> backOrderSkuVos;

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreBackOrderServiceImpl.java

@@ -223,7 +223,7 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
         {// 券类商品-拒绝退款后，恢复已发放券状态
             List<GoblinBackOrderSkuVo> backOrderSkuVos = backOrderVo.getBackOrderSkuVos();
             for (GoblinBackOrderSkuVo backOrderSkuVo : backOrderSkuVos) {
-                if (2 == backOrderSkuVo.getSkuType()) {
+                if (null != backOrderSkuVo.getSkuType() && 2 == backOrderSkuVo.getSkuType()) {
                     // 券类商品默认一个商品对应一个券，下单只可购买一张
                     String ucKey = CandyRedisConst.BASIC_USER_COUPON.concat(backOrderVo.getUserId());
                     List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisUtils.get(ucKey);
@@ -569,6 +569,8 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
             vo.setProcessedAt(item.getRefundAt());
         } else if (StringUtil.isNotBlank(item.getAuditAt())) {
             vo.setProcessedAt(item.getAuditAt());
+        } else if (StringUtil.isNotBlank(item.getRefuseAt())) {
+            vo.setProcessedAt(item.getRefuseAt());
         }
         Integer operationType = resolveBackOrderOperationType(item);
         vo.setOperationType(operationType);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -1506,19 +1506,9 @@ public class GoblinMongoUtils {
         Criteria criteria = storeBackOrderListCriteria(storeId, orderBackCode, type, cst, cet, orderCode, spuName, status);
         Query query = Query.query(criteria);
         query.skip(skipCount).limit(size).with(Sort.by(Sort.Order.desc("createdAt")));
-        ;
-        query.fields().include("backCode").include("orderCode").include("orderId").include("backOrderId").include("type").include("status")
-                .include("realBackPrice").include("createdAt").include("auditAt").include("refundAt").include("describes").include("reason")
-                .include("operationType")
-                .include("backOrderSkuVos.spuName").include("backOrderSkuVos.skuName").include("backOrderSkuVos.spuPic").include("backOrderSkuVos.skuPic")
-                .include("backOrderSkuVos.skuSpecs").include("backOrderSkuVos.skuId").include("backOrderSkuVos.spuId").include("backOrderSkuVos.orderSkuId")
-                .include("backOrderSkuVos.refundPrice");
         List<GoblinBackOrderVo> dataList = mongoTemplate.find(query, GoblinBackOrderVo.class, GoblinBackOrderVo.class.getSimpleName());
         //查询总数量
-        Query countQuery = Query.query(criteria);
-        countQuery.fields().include("orderCode");
-        List<GoblinBackOrderVo> countList = mongoTemplate.find(countQuery, GoblinBackOrderVo.class, GoblinBackOrderVo.class.getSimpleName());
-        long total = countList.size();
+        long total = mongoTemplate.count(Query.query(criteria), GoblinBackOrderVo.class, GoblinBackOrderVo.class.getSimpleName());
         HashMap<String, Object> map = CollectionUtil.mapStringObject();
         map.put("data", dataList);
         map.put("total", total);