订单关闭逻辑 -uncheck

第三方订单列表 -check
订单详情 -check
正在下单-出货-uncheck
正在下单-绑定-uncheck

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

@@ -39,8 +39,7 @@ public class GoblinOrderAttrVo implements Serializable,Cloneable {
     @ApiModelProperty(value = " 订单的赠品信息格式为JSON")
     private String giftInfos;
     @ApiModelProperty(value = " 创建时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    private LocalDateTime createdAt;
+    private String createdAt;
 
     private static final GoblinOrderAttrVo obj = new GoblinOrderAttrVo();
 

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

@@ -55,8 +55,7 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "款式最终优惠价")
     private BigDecimal priceVoucher;
     @ApiModelProperty(value = "创建时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    private LocalDateTime createdAt;
+    private String createdAt;
 
     private static final GoblinOrderSkuVo obj = new GoblinOrderSkuVo();
 

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

@@ -18,8 +18,7 @@ public class GoblinStoreOrderListVo implements Cloneable {
     @ApiModelProperty(value = "订单号")
     private String orderCode;
     @ApiModelProperty(value = "下单时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    private LocalDateTime createdAt;
+    private String createdAt;
     @ApiModelProperty(value = "下单方式")
     private String payType;
     @ApiModelProperty(value = " 收货人姓名")
@@ -37,8 +36,7 @@ public class GoblinStoreOrderListVo implements Cloneable {
     @ApiModelProperty(value = " 订单状态")
     private Integer status;
     @ApiModelProperty(value = " 付款时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    private LocalDateTime payTime;
+    private String payTime;
     @ApiModelProperty(value = " 物流公司姓名")
     private String logisticsCompany;
     //todo 胡佳晨 缺发货时间

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

@@ -76,14 +76,11 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "订单类型[0-普通订单|1-定金预售订单|2-全款预售订单|3-拼团订单|4-众筹全款|5-众筹1元|6-众筹无回报|7-虚拟商品订单|8-社区团购订单|9-正在下单]")
     private Integer orderType;
     @ApiModelProperty(value = " 支付时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    private LocalDateTime payTime;
+    private String payTime;
     @ApiModelProperty(value = " 取消时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    private LocalDateTime cancelTime;
+    private String cancelTime;
     @ApiModelProperty(value = " 管理员修改订单时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    private LocalDateTime modifyTime;
+    private String modifyTime;
     @ApiModelProperty(value = " 抽奖状态[0-未抽奖|1-中奖|2-已抽奖]")
     private String lotteryStatus;
     @ApiModelProperty(value = " 虚拟订单核销码[正在支付取货码]")
@@ -93,8 +90,7 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
     @ApiModelProperty(value = " 快递单号")
     private String mailNo;
     @ApiModelProperty(value = " 发货时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    private LocalDateTime deliveryTime;
+    private String deliveryTime;
     @ApiModelProperty(value = " 物流公司姓名")
     private String logisticsCompany;
     @ApiModelProperty(value = " 物流公司code[物流公司id]")
@@ -102,8 +98,7 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
     @ApiModelProperty(value = " ip")
     private String ipAddress;
     @ApiModelProperty(value = " 创建时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    private LocalDateTime createdAt;
+    private String createdAt;
 
     @ApiModelProperty(value = "orderAttr")
     private GoblinOrderAttrVo orderAttrVo;

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

@@ -82,7 +82,6 @@ public class GoblinZhengzaiController {
     @ApiOperation("活动详情-正在下单-配置商铺sku")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<Boolean> zhengzaiStoreInsert(@RequestBody GoblinStoreZhengzaiCommonParam params) {
-
         return goblinZhengzaiService.zhengzaiSkuInsert(params);
     }
 

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

@@ -34,6 +34,8 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
+import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
+
 @Service
 @Slf4j
 public class GoblinOrderServiceImpl implements IGoblinOrderService {
@@ -476,7 +478,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
 //            httpData.add("orderId", storeOrderVo.getOrderId());
             httpData.add("clientIp", storeOrderVo.getIpAddress());
             httpData.add("notifyUrl", synUrl);
-            httpData.add("createDate", storeOrderVo.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            httpData.add("createDate", storeOrderVo.getCreatedAt());
             httpData.add("expireTime", storeOrderVo.getPayCountdownMinute().toString());
             httpData.add("payType", storeOrderVo.getPayType());
             httpData.add("deviceFrom", param.getDeviceFrom());
@@ -610,7 +612,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 }
                 //redis
                 orderVo.setPayCode(storeOrder.getPayCode());
-                orderVo.setPayTime(storeOrder.getPayTime());
+                orderVo.setPayTime(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(storeOrder.getPayTime()));
                 orderVo.setWriteOffCode(storeOrder.getWriteOffCode());
                 orderVo.setStatus(storeOrder.getStatus());
                 orderVo.setOrderSkuVoIds(skuList);

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

@@ -50,6 +50,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             vo.setPayType(item.getPayType());
             vo.setPriceActual(item.getPriceActual());
             vo.setStatus(item.getStatus());
+            vo.setPriceExpress(item.getPriceExpress());
             List<GoblinStoreOrderListSkuVo> orderListSkuVos = ObjectUtil.getGoblinStoreOrderListSkuVoArrayList();
             for (String skuId : item.getOrderSkuVoIds()) {
                 GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(skuId);
@@ -60,9 +61,11 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                 itemSkuVo.setSkuName(orderSkuVo.getSkuName());
                 itemSkuVo.setSkuPriceActual(orderSkuVo.getSkuPriceActual());
                 itemSkuVo.setSkuSpecs(orderSkuVo.getSkuSpecs());
+                itemSkuVo.setSkuImage(orderSkuVo.getSkuImage());
                 orderListSkuVos.add(itemSkuVo);
             }
             vo.setStoreOrderListSkuVoList(orderListSkuVos);
+            listVos.add(vo);
         }
         PageInfo<GoblinStoreOrderListVo> pageInfo = new PageInfo(listVos);
         pageInfo.setTotal(total);
@@ -89,6 +92,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         vo.setPriceActual(orderVo.getPriceActual());
         vo.setStatus(orderVo.getStatus());
         vo.setPayTime(orderVo.getPayTime());
+        vo.setPriceExpress(orderVo.getPriceExpress());
         vo.setLogisticsCompany(orderVo.getLogisticsCompany());
         List<GoblinStoreOrderListSkuVo> orderListSkuVos = ObjectUtil.getGoblinStoreOrderListSkuVoArrayList();
         for (String skuId : orderVo.getOrderSkuVoIds()) {
@@ -100,6 +104,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             itemSkuVo.setSkuName(orderSkuVo.getSkuName());
             itemSkuVo.setSkuPriceActual(orderSkuVo.getSkuPriceActual());
             itemSkuVo.setSkuSpecs(orderSkuVo.getSkuSpecs());
+            itemSkuVo.setSkuImage(orderSkuVo.getSkuImage());
             orderListSkuVos.add(itemSkuVo);
         }
         vo.setStoreOrderListSkuVoList(orderListSkuVos);

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

@@ -555,7 +555,7 @@ public class GoblinMongoUtils {
         }
         Query query = Query.query(criteria);
         query.skip(skipCount).limit(size);
-        query.fields().include("orderCode").include("createdAt").include("payType").include("status").include("orderSkuVoIds").include("orderId").include("priceActual")
+        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");
         List<GoblinStoreOrderVo> dataList = mongoTemplate.find(query, GoblinStoreOrderVo.class, GoblinStoreOrderVo.class.getSimpleName());
         //查询总数量