修改 sku价格接口 订单详情

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

@@ -39,6 +39,8 @@ public class GoblinStoreOrderListVo implements Cloneable {
     private String payTime;
     @ApiModelProperty(value = " 物流公司姓名")
     private String logisticsCompany;
+    @ApiModelProperty(value = " 活动名称")
+    private String marketName;
     @ApiModelProperty(value = " 物流相关")
     private List<GoblinMailVo> goblinMailVoList;
     //todo hujiachen 缺发货时间

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

@@ -127,6 +127,13 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         vo.setStatus(orderVo.getStatus());
         vo.setPayTime(orderVo.getPayTime());
         vo.setPriceExpress(orderVo.getPriceExpress());
+        if (orderVo.getMarketId() == null || orderVo.getMarketId().equals("")) {
+            vo.setMarketName("");
+        } else {
+            GoblinSelfMarketingVo marketingVo = redisUtils.getSelfMarket(orderVo.getMarketId());
+            vo.setMarketName(marketingVo.getName());
+        }
+
         vo.setGoblinMailVoList(redisUtils.getGoblinMail(orderId));
         List<GoblinStoreOrderListSkuVo> orderListSkuVos = ObjectUtil.getGoblinStoreOrderListSkuVoArrayList();
         for (String skuId : orderVo.getOrderSkuVoIds()) {
@@ -323,7 +330,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             return ResponseDto.failure("不存在");
         }
         BigDecimal voucherPrice = orderSkuVo.getSkuPriceActual().subtract(price);
-        orderSkuVo.setPriceModify(orderSkuVo.getPriceModify().add(price));
+        orderSkuVo.setPriceModify(orderSkuVo.getPriceModify() == null ? price : orderSkuVo.getPriceModify().add(price));
 //        orderSkuVo.setPriceVoucher(orderSkuVo.getPriceVoucher().add(voucherPrice));
         orderSkuVo.setSkuPriceActual(orderSkuVo.getSkuPriceActual().subtract(voucherPrice));
         orderVo.setPriceTotal(orderVo.getPriceTotal().subtract(voucherPrice));

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

@@ -398,6 +398,7 @@ public class GoblinMongoUtils {
         List<GoblinGoodsInfoVo> goblinGoodsInfoVos = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
         return CollectionUtils.isEmpty(goblinGoodsInfoVos) ? CollectionUtil.arrayListString() : goblinGoodsInfoVos.stream().map(GoblinGoodsInfoVo::getSpuNo).distinct().collect(Collectors.toList());
     }
+
     public List<String> getMgtSpuIdsForMarketBySpuNos(List<String> spuNos, Object... shelvesStatus) {
         Query query = Query.query(Criteria.where("spuNo").in(spuNos.toArray())
                 .and("marketId").exists(true).and("delFlg").is("0").and("shelvesStatus").in(shelvesStatus));
@@ -927,6 +928,7 @@ public class GoblinMongoUtils {
             criteria = criteria.and("orderAttrVo.expressContacts").is(expressContacts);
         }
         Query query = Query.query(criteria);
+        query.with(Sort.by(Sort.Order.desc("createdAt")));
         query.skip(skipCount).limit(size);
         query.fields().include("orderCode").include("createdAt").include("payType").include("status").include("orderSkuVoIds").include("orderId").include("priceActual").include("priceExpress")
                 .include("orderAttrVo.expressContacts").include("orderAttrVo.expressAddressDetail").include("orderAttrVo.expressAddress").include("orderAttrVo.expressPhone");