记得上下班打卡 | git大法好,push需谨慎

Commit 3d7ad028 authored by 胡佳晨's avatar 胡佳晨

订单关闭逻辑 -uncheck

第三方订单列表 -check
订单详情 -check
正在下单-出货-uncheck
正在下单-绑定-uncheck
parent 16b61116
...@@ -39,8 +39,7 @@ public class GoblinOrderAttrVo implements Serializable,Cloneable { ...@@ -39,8 +39,7 @@ public class GoblinOrderAttrVo implements Serializable,Cloneable {
@ApiModelProperty(value = " 订单的赠品信息格式为JSON") @ApiModelProperty(value = " 订单的赠品信息格式为JSON")
private String giftInfos; private String giftInfos;
@ApiModelProperty(value = " 创建时间") @ApiModelProperty(value = " 创建时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR) private String createdAt;
private LocalDateTime createdAt;
private static final GoblinOrderAttrVo obj = new GoblinOrderAttrVo(); private static final GoblinOrderAttrVo obj = new GoblinOrderAttrVo();
......
...@@ -55,8 +55,7 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable { ...@@ -55,8 +55,7 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable {
@ApiModelProperty(value = "款式最终优惠价") @ApiModelProperty(value = "款式最终优惠价")
private BigDecimal priceVoucher; private BigDecimal priceVoucher;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR) private String createdAt;
private LocalDateTime createdAt;
private static final GoblinOrderSkuVo obj = new GoblinOrderSkuVo(); private static final GoblinOrderSkuVo obj = new GoblinOrderSkuVo();
......
...@@ -18,8 +18,7 @@ public class GoblinStoreOrderListVo implements Cloneable { ...@@ -18,8 +18,7 @@ public class GoblinStoreOrderListVo implements Cloneable {
@ApiModelProperty(value = "订单号") @ApiModelProperty(value = "订单号")
private String orderCode; private String orderCode;
@ApiModelProperty(value = "下单时间") @ApiModelProperty(value = "下单时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR) private String createdAt;
private LocalDateTime createdAt;
@ApiModelProperty(value = "下单方式") @ApiModelProperty(value = "下单方式")
private String payType; private String payType;
@ApiModelProperty(value = " 收货人姓名") @ApiModelProperty(value = " 收货人姓名")
...@@ -37,8 +36,7 @@ public class GoblinStoreOrderListVo implements Cloneable { ...@@ -37,8 +36,7 @@ public class GoblinStoreOrderListVo implements Cloneable {
@ApiModelProperty(value = " 订单状态") @ApiModelProperty(value = " 订单状态")
private Integer status; private Integer status;
@ApiModelProperty(value = " 付款时间") @ApiModelProperty(value = " 付款时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR) private String payTime;
private LocalDateTime payTime;
@ApiModelProperty(value = " 物流公司姓名") @ApiModelProperty(value = " 物流公司姓名")
private String logisticsCompany; private String logisticsCompany;
//todo 胡佳晨 缺发货时间 //todo 胡佳晨 缺发货时间
......
...@@ -76,14 +76,11 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable { ...@@ -76,14 +76,11 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
@ApiModelProperty(value = "订单类型[0-普通订单|1-定金预售订单|2-全款预售订单|3-拼团订单|4-众筹全款|5-众筹1元|6-众筹无回报|7-虚拟商品订单|8-社区团购订单|9-正在下单]") @ApiModelProperty(value = "订单类型[0-普通订单|1-定金预售订单|2-全款预售订单|3-拼团订单|4-众筹全款|5-众筹1元|6-众筹无回报|7-虚拟商品订单|8-社区团购订单|9-正在下单]")
private Integer orderType; private Integer orderType;
@ApiModelProperty(value = " 支付时间") @ApiModelProperty(value = " 支付时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR) private String payTime;
private LocalDateTime payTime;
@ApiModelProperty(value = " 取消时间") @ApiModelProperty(value = " 取消时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR) private String cancelTime;
private LocalDateTime cancelTime;
@ApiModelProperty(value = " 管理员修改订单时间") @ApiModelProperty(value = " 管理员修改订单时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR) private String modifyTime;
private LocalDateTime modifyTime;
@ApiModelProperty(value = " 抽奖状态[0-未抽奖|1-中奖|2-已抽奖]") @ApiModelProperty(value = " 抽奖状态[0-未抽奖|1-中奖|2-已抽奖]")
private String lotteryStatus; private String lotteryStatus;
@ApiModelProperty(value = " 虚拟订单核销码[正在支付取货码]") @ApiModelProperty(value = " 虚拟订单核销码[正在支付取货码]")
...@@ -93,8 +90,7 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable { ...@@ -93,8 +90,7 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
@ApiModelProperty(value = " 快递单号") @ApiModelProperty(value = " 快递单号")
private String mailNo; private String mailNo;
@ApiModelProperty(value = " 发货时间") @ApiModelProperty(value = " 发货时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR) private String deliveryTime;
private LocalDateTime deliveryTime;
@ApiModelProperty(value = " 物流公司姓名") @ApiModelProperty(value = " 物流公司姓名")
private String logisticsCompany; private String logisticsCompany;
@ApiModelProperty(value = " 物流公司code[物流公司id]") @ApiModelProperty(value = " 物流公司code[物流公司id]")
...@@ -102,8 +98,7 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable { ...@@ -102,8 +98,7 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
@ApiModelProperty(value = " ip") @ApiModelProperty(value = " ip")
private String ipAddress; private String ipAddress;
@ApiModelProperty(value = " 创建时间") @ApiModelProperty(value = " 创建时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR) private String createdAt;
private LocalDateTime createdAt;
@ApiModelProperty(value = "orderAttr") @ApiModelProperty(value = "orderAttr")
private GoblinOrderAttrVo orderAttrVo; private GoblinOrderAttrVo orderAttrVo;
......
...@@ -82,7 +82,6 @@ public class GoblinZhengzaiController { ...@@ -82,7 +82,6 @@ public class GoblinZhengzaiController {
@ApiOperation("活动详情-正在下单-配置商铺sku") @ApiOperation("活动详情-正在下单-配置商铺sku")
@ApiResponse(code = 200, message = "接口返回对象参数") @ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<Boolean> zhengzaiStoreInsert(@RequestBody GoblinStoreZhengzaiCommonParam params) { public ResponseDto<Boolean> zhengzaiStoreInsert(@RequestBody GoblinStoreZhengzaiCommonParam params) {
return goblinZhengzaiService.zhengzaiSkuInsert(params); return goblinZhengzaiService.zhengzaiSkuInsert(params);
} }
......
...@@ -34,6 +34,8 @@ import java.time.LocalDateTime; ...@@ -34,6 +34,8 @@ import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
@Service @Service
@Slf4j @Slf4j
public class GoblinOrderServiceImpl implements IGoblinOrderService { public class GoblinOrderServiceImpl implements IGoblinOrderService {
...@@ -476,7 +478,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -476,7 +478,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
// httpData.add("orderId", storeOrderVo.getOrderId()); // httpData.add("orderId", storeOrderVo.getOrderId());
httpData.add("clientIp", storeOrderVo.getIpAddress()); httpData.add("clientIp", storeOrderVo.getIpAddress());
httpData.add("notifyUrl", synUrl); 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("expireTime", storeOrderVo.getPayCountdownMinute().toString());
httpData.add("payType", storeOrderVo.getPayType()); httpData.add("payType", storeOrderVo.getPayType());
httpData.add("deviceFrom", param.getDeviceFrom()); httpData.add("deviceFrom", param.getDeviceFrom());
...@@ -610,7 +612,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -610,7 +612,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
} }
//redis //redis
orderVo.setPayCode(storeOrder.getPayCode()); 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.setWriteOffCode(storeOrder.getWriteOffCode());
orderVo.setStatus(storeOrder.getStatus()); orderVo.setStatus(storeOrder.getStatus());
orderVo.setOrderSkuVoIds(skuList); orderVo.setOrderSkuVoIds(skuList);
......
...@@ -50,6 +50,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService { ...@@ -50,6 +50,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
vo.setPayType(item.getPayType()); vo.setPayType(item.getPayType());
vo.setPriceActual(item.getPriceActual()); vo.setPriceActual(item.getPriceActual());
vo.setStatus(item.getStatus()); vo.setStatus(item.getStatus());
vo.setPriceExpress(item.getPriceExpress());
List<GoblinStoreOrderListSkuVo> orderListSkuVos = ObjectUtil.getGoblinStoreOrderListSkuVoArrayList(); List<GoblinStoreOrderListSkuVo> orderListSkuVos = ObjectUtil.getGoblinStoreOrderListSkuVoArrayList();
for (String skuId : item.getOrderSkuVoIds()) { for (String skuId : item.getOrderSkuVoIds()) {
GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(skuId); GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(skuId);
...@@ -60,9 +61,11 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService { ...@@ -60,9 +61,11 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
itemSkuVo.setSkuName(orderSkuVo.getSkuName()); itemSkuVo.setSkuName(orderSkuVo.getSkuName());
itemSkuVo.setSkuPriceActual(orderSkuVo.getSkuPriceActual()); itemSkuVo.setSkuPriceActual(orderSkuVo.getSkuPriceActual());
itemSkuVo.setSkuSpecs(orderSkuVo.getSkuSpecs()); itemSkuVo.setSkuSpecs(orderSkuVo.getSkuSpecs());
itemSkuVo.setSkuImage(orderSkuVo.getSkuImage());
orderListSkuVos.add(itemSkuVo); orderListSkuVos.add(itemSkuVo);
} }
vo.setStoreOrderListSkuVoList(orderListSkuVos); vo.setStoreOrderListSkuVoList(orderListSkuVos);
listVos.add(vo);
} }
PageInfo<GoblinStoreOrderListVo> pageInfo = new PageInfo(listVos); PageInfo<GoblinStoreOrderListVo> pageInfo = new PageInfo(listVos);
pageInfo.setTotal(total); pageInfo.setTotal(total);
...@@ -89,6 +92,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService { ...@@ -89,6 +92,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
vo.setPriceActual(orderVo.getPriceActual()); vo.setPriceActual(orderVo.getPriceActual());
vo.setStatus(orderVo.getStatus()); vo.setStatus(orderVo.getStatus());
vo.setPayTime(orderVo.getPayTime()); vo.setPayTime(orderVo.getPayTime());
vo.setPriceExpress(orderVo.getPriceExpress());
vo.setLogisticsCompany(orderVo.getLogisticsCompany()); vo.setLogisticsCompany(orderVo.getLogisticsCompany());
List<GoblinStoreOrderListSkuVo> orderListSkuVos = ObjectUtil.getGoblinStoreOrderListSkuVoArrayList(); List<GoblinStoreOrderListSkuVo> orderListSkuVos = ObjectUtil.getGoblinStoreOrderListSkuVoArrayList();
for (String skuId : orderVo.getOrderSkuVoIds()) { for (String skuId : orderVo.getOrderSkuVoIds()) {
...@@ -100,6 +104,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService { ...@@ -100,6 +104,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
itemSkuVo.setSkuName(orderSkuVo.getSkuName()); itemSkuVo.setSkuName(orderSkuVo.getSkuName());
itemSkuVo.setSkuPriceActual(orderSkuVo.getSkuPriceActual()); itemSkuVo.setSkuPriceActual(orderSkuVo.getSkuPriceActual());
itemSkuVo.setSkuSpecs(orderSkuVo.getSkuSpecs()); itemSkuVo.setSkuSpecs(orderSkuVo.getSkuSpecs());
itemSkuVo.setSkuImage(orderSkuVo.getSkuImage());
orderListSkuVos.add(itemSkuVo); orderListSkuVos.add(itemSkuVo);
} }
vo.setStoreOrderListSkuVoList(orderListSkuVos); vo.setStoreOrderListSkuVoList(orderListSkuVos);
......
...@@ -555,7 +555,7 @@ public class GoblinMongoUtils { ...@@ -555,7 +555,7 @@ public class GoblinMongoUtils {
} }
Query query = Query.query(criteria); Query query = Query.query(criteria);
query.skip(skipCount).limit(size); 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"); .include("orderAttrVo.expressContacts").include("orderAttrVo.expressAddressDetail").include("orderAttrVo.expressAddress").include("orderAttrVo.expressPhone");
List<GoblinStoreOrderVo> dataList = mongoTemplate.find(query, GoblinStoreOrderVo.class, GoblinStoreOrderVo.class.getSimpleName()); List<GoblinStoreOrderVo> dataList = mongoTemplate.find(query, GoblinStoreOrderVo.class, GoblinStoreOrderVo.class.getSimpleName());
//查询总数量 //查询总数量
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment