订单相关 文档

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

@@ -77,9 +77,11 @@ public class GoblinStoreOrderController {
     @ApiOperation(value = "修改订单价格")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderId", value = "订单id"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "BigDecimal", name = "price", value = "退款金额"),
     })
     @GetMapping(value = "change/price")
-    public ResponseDto<Boolean> changePrice(@RequestParam(value = "orderId", required = true) @Valid String orderId) {
+    public ResponseDto<Boolean> changePrice(@RequestParam(value = "orderId", required = true) @Valid String orderId,
+                                            @RequestParam(value = "orderId", required = true) @Valid BigDecimal price) {
         return ResponseDto.success();
     }
 
@@ -87,10 +89,12 @@ public class GoblinStoreOrderController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderId", value = "订单id"),
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderSkuId", value = "orderSkuId"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "BigDecimal", name = "price", value = "退款金额"),
     })
     @GetMapping(value = "change/skuPrice")
     public ResponseDto<Boolean> changeSkuPrice(@RequestParam(value = "orderId", required = true) @Valid String orderId,
-                                               @RequestParam(value = "orderSkuId", required = true) @Valid String orderSkuId) {
+                                               @RequestParam(value = "orderSkuId", required = true) @Valid String orderSkuId,
+                                               @RequestParam(value = "orderId", required = true) @Valid BigDecimal price) {
         return ResponseDto.success();
     }
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/DMCheckGoblinOrderTimeImpl.java

@@ -35,6 +35,8 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 import java.util.*;
 
+import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
+
 
 /**
  * <p>
@@ -63,7 +65,7 @@ public class DMCheckGoblinOrderTimeImpl extends ServiceImpl<GoblinStoreOrderMapp
             List<String> orderIds = goblinRedisUtils.getUnPayGoblinOrderList(i + "");
             for (String orderId : orderIds) {
                 GoblinStoreOrderVo orderVo = goblinRedisUtils.getGoblinOrder(orderId);
-                LocalDateTime expireTime = orderVo.getCreatedAt().plusMinutes(orderVo.getPayCountdownMinute() + 1);
+                LocalDateTime expireTime = LocalDateTime.parse(orderVo.getCreatedAt(),DTF_YMD_HMS).plusMinutes(orderVo.getPayCountdownMinute() + 1);
                 if (now.isAfter(expireTime) && orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_0.getValue()) {//过期
                     LinkedList<String> sqls = CollectionUtil.linkedListString();
                     LinkedList<Object[]> sqlDataOrder = CollectionUtil.linkedListObjectArr();