下单接口

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 商城订单属性表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-12-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GoblinOrderAttrVo implements Serializable,Cloneable {
+    @ApiModelProperty(value = " 住建id")
+    private String orderAttrId;
+    @ApiModelProperty(value = " 订单id")
+    private String orderId;
+    @ApiModelProperty(value = " 收货人")
+    private String expressContacts;
+    @ApiModelProperty(value = " 收货地址[省市区]")
+    private String expressAddress;
+    @ApiModelProperty(value = " 收货地址[详细]")
+    private String expressAddressDetail;
+    @ApiModelProperty(value = " 收货人联系方式")
+    private String expressPhone;
+    @ApiModelProperty(value = " 快递方式 [1寄付|2到付|3-包邮]")
+    private Integer expressType;
+    @ApiModelProperty(value = " 订单的赠品信息格式为JSON")
+    private String giftInfos;
+    @ApiModelProperty(value = " 创建时间")
+    private LocalDateTime createdAt;
+
+    private static final GoblinOrderAttrVo obj = new GoblinOrderAttrVo();
+
+    public static GoblinOrderAttrVo getNew() {
+        try {
+            return (GoblinOrderAttrVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinOrderAttrVo();
+        }
+    }
+}

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 订单单品表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-12-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GoblinOrderSkuVo implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "订单sku_id")
+    private String orderSkuId;
+    @ApiModelProperty(value = "订单id")
+    private String orderId;
+    @ApiModelProperty(value = "商品id")
+    private String spuId;
+    @ApiModelProperty(value = "款式id")
+    private String skuId;
+    @ApiModelProperty(value = "数量")
+    private Integer num;
+    @ApiModelProperty(value = "款式原价")
+    private BigDecimal skuPrice;
+    @ApiModelProperty(value = "款式实付价")
+    private BigDecimal skuPriceActual;
+    @ApiModelProperty(value = "退款价格")
+    private BigDecimal priceRefund;
+    @ApiModelProperty(value = "款式名称")
+    private String skuName;
+    @ApiModelProperty(value = "款式编号")
+    private String skuNo;
+    @ApiModelProperty(value = "款式图片")
+    private String skuImage;
+    @ApiModelProperty(value = "款式规格")
+    private String skuSpecs;
+    @ApiModelProperty(value = "管理员优惠价格")
+    private BigDecimal priceModify;
+    @ApiModelProperty(value = "款式最终优惠价")
+    private BigDecimal priceVoucher;
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime createdAt;
+
+    private static final GoblinOrderSkuVo obj = new GoblinOrderSkuVo();
+
+    public static GoblinOrderSkuVo getNew() {
+        try {
+            return (GoblinOrderSkuVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinOrderSkuVo();
+        }
+    }
+}

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 商城订单表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-12-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GoblinStoreOrderVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = " 订单id")
+    private String orderId;
+    @ApiModelProperty(value = " 店铺id")
+    private String storeId;
+    @ApiModelProperty(value = " 主订单code  下单可能会同时下多个订单 ")
+    private String masterOrderCode;
+    @ApiModelProperty(value = " 订单号")
+    private String orderCode;
+    @ApiModelProperty(value = " 支付单号")
+    private String payCode;
+    @ApiModelProperty(value = " 用户id")
+    private String userId;
+    @ApiModelProperty(value = " 用户昵称")
+    private String userName;
+    @ApiModelProperty(value = " 用户手机号")
+    private String userMobile;
+    @ApiModelProperty(value = " 应付金额")
+    private BigDecimal priceTotal;
+    @ApiModelProperty(value = " 实付金额")
+    private BigDecimal priceActual;
+    @ApiModelProperty(value = " 退款价格")
+    private BigDecimal priceRefund;
+    @ApiModelProperty(value = " 商铺营销表id")
+    private BigDecimal priceExpress;
+    @ApiModelProperty(value = " 管理员修改优惠金额")
+    private BigDecimal priceModify;
+    @ApiModelProperty(value = "券优惠金额")
+    private BigDecimal priceCoupon;
+    @ApiModelProperty(value = " 总优惠价格")
+    private BigDecimal priceVoucher;
+    @ApiModelProperty(value = " 订单状态[0-待付款(用户刚下单)|2-代发货(用户付完款 等待商城发货)3-代收货(商城已经发货 等待用户确认收货)|4-已完成(用户已经确认收货 订单结束)|5-取消订单(用户未付款前取消订单)|6-退款通过(用户已经付款但是商城还未发货，用户发出退款申请，商城同意退款)|7-退货通过(用户已经确认收货后用户发出退货申请，商城同意所有退货申请 ，一个订单可能有多个单品)]")
+    private Integer status;
+    @ApiModelProperty(value = " 券id")
+    private String ucouponId;
+    @ApiModelProperty(value = " 支付类型[wepay-微信支付|alipay-阿里支付|douyinpay-抖音支付|unionpay-银联支付]")
+    private String payType;
+    @ApiModelProperty(value = " 取消原因")
+    private String cancelReason;
+    @ApiModelProperty(value = " 订单来源[app|h5|applet]")
+    private String source;
+    @ApiModelProperty(value = " 版本号")
+    private String version;
+    @ApiModelProperty(value = " 是否会员")
+    private Integer isMember;
+    @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;
+    @ApiModelProperty(value = " 取消时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime cancelTime;
+    @ApiModelProperty(value = " 管理员修改订单时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime modifyTime;
+    @ApiModelProperty(value = " 抽奖状态[0-未抽奖|1-中奖|2-已抽奖]")
+    private String lotteryStatus;
+    @ApiModelProperty(value = " 虚拟订单核销码[正在支付取货码]")
+    private String writeOffCode;
+    @ApiModelProperty(value = " 订单过期时间(分钟)")
+    private Integer payCountdownMinute;
+    @ApiModelProperty(value = " 快递单号")
+    private String mailNo;
+    @ApiModelProperty(value = " 发货时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime deliveryTime;
+    @ApiModelProperty(value = " 物流公司姓名")
+    private String logisticsCompany;
+    @ApiModelProperty(value = " 物流公司code[物流公司id]")
+    private String logisticsCode;
+    @ApiModelProperty(value = " 创建时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime createdAt;
+
+
+    private static final GoblinStoreOrderVo obj = new GoblinStoreOrderVo();
+
+    public static GoblinStoreOrderVo getNew() {
+        try {
+            return (GoblinStoreOrderVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinStoreOrderVo();
+        }
+    }
+}

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 轮播图
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-12-27
+ */
+@ApiModel(value = "GoblinZhengzaiGoodVo", description = "正在下单商铺列表vo")
+@Data
+public class GoblinZhengzaiGoodVo implements Serializable {
+    @ApiModelProperty(position = 10, value = "店铺ID")
+    private String storeId;
+    @ApiModelProperty(position = 11, value = "商品ID[64]")
+    private String spuId;
+    @ApiModelProperty(position = 12, value = "商品编码[默认为系统编码，也可手动输入商家自己的编码]")
+    private String spuNo;
+    @ApiModelProperty(position = 13, value = "商品名称[100]")
+    private String name;
+    @ApiModelProperty(position = 14, value = "商品副标题[128]")
+    private String subtitle;
+    @ApiModelProperty(position = 15, value = "销售价[20,2]")
+    private BigDecimal sellPrice;
+    @ApiModelProperty(position = 16, value = "价格区间MIN[20,2]")
+    private BigDecimal priceGe;
+    @ApiModelProperty(position = 17, value = "价格区间MAX[20,2]")
+    private BigDecimal priceLe;
+    @ApiModelProperty(position = 20, value = "封面图片地址[256]")
+    private String coverPic;
+    @ApiModelProperty(position = 52, value = "商品标签列表")
+    private List<GoblinGoodsTagVo> tagVoList;
+    @ApiModelProperty(position = 53, value = "商品服务支持列表")
+    private List<GoblinServiceSupportVo> serviceSupportVoList;
+    @ApiModelProperty(position = 54, value = "音乐人、艺术家、IP列表")
+    private List<GoblinGoodsExtagVo> extagVoList;
+    @ApiModelProperty(position = 55, value = "活动Id")
+    private String marketId;
+
+    private static final GoblinZhengzaiGoodVo obj = new GoblinZhengzaiGoodVo();
+
+    public static GoblinZhengzaiGoodVo getNew() {
+        try {
+            return (GoblinZhengzaiGoodVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinZhengzaiGoodVo();
+        }
+    }
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/PayAgainParam.java

+package com.liquidnet.service.goblin.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class PayAgainParam {
+    @ApiModelProperty(value = "订单id")
+    @NotNull(message = "订单ID不能为空")
+    private String orderId;
+    @ApiModelProperty(value = "支付类型")
+    @NotNull(message = "支付类型不能为空")
+    private String payType;
+    @ApiModelProperty(value = "支付来源")
+    @NotNull(message = "支付来源不能为空")
+    private String deviceFrom;
+    @ApiModelProperty(value = "openId")
+    private String openId;
+    @ApiModelProperty(value = "showUrl")
+    private String showUrl;
+    @ApiModelProperty(value = "returnUrl")
+    private String returnUrl;
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/vo/SyncOrderParam.java → liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/SyncOrderParam.java

-package com.liquidnet.service.goblin.dto.manage.vo;
+package com.liquidnet.service.goblin.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinAppOrderService.java

@@ -3,9 +3,15 @@ package com.liquidnet.service.goblin.service;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinPayInnerResultVo;
+import com.liquidnet.service.goblin.param.PayAgainParam;
+import com.liquidnet.service.goblin.param.SyncOrderParam;
 
 public interface IGoblinAppOrderService {
 
     ResponseDto<GoblinPayInnerResultVo> checkOrder(GoblinOrderParam param);
 
+    ResponseDto<GoblinPayInnerResultVo> payAgain(PayAgainParam param);
+
+    ResponseDto<GoblinPayInnerResultVo> syncOrder(SyncOrderParam syncOrderParam);
+
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinAppZhengzaiService.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.service;
 
 import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinShowStoreInfoVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiGoodVo;
 
 import java.util.List;
 
@@ -22,4 +23,12 @@ public interface IGoblinAppZhengzaiService {
      */
     List<GoblinShowStoreInfoVo> getStoreList(String marketId);
 
+
+    /**
+     * 正在下单 商铺参与活动的商品列表
+     * @param marketId
+     * @param storeId
+     * @return
+     */
+    List<GoblinZhengzaiGoodVo> getSpuList(String marketId,String storeId);
 }

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

 package com.liquidnet.service.goblin.controller;
 
-import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.codec.vo.EncryptedReq;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinPayInnerResultVo;
-import com.liquidnet.service.goblin.dto.manage.vo.SyncOrderParam;
-import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
+import com.liquidnet.service.goblin.param.PayAgainParam;
+import com.liquidnet.service.goblin.param.SyncOrderParam;
 import com.liquidnet.service.goblin.service.IGoblinAppOrderService;
-import com.liquidnet.service.goblin.service.IGoblinAppZhengzaiService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -17,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.List;
 
 @Slf4j
 @Api(tags = "订单相关")
@@ -48,10 +45,10 @@ public class GoblinAppOrderController {
         return null;
     }
 
-//    @PostMapping("payAgain")
-//    @ApiOperation("再次支付")
-//    @ApiResponse(code = 200, message = "接口返回对象参数")
-//    public ResponseDto<GoblinPayInnerResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
-//        return null;
-//    }
+    @PostMapping("payAgain")
+    @ApiOperation("再次支付")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<GoblinPayInnerResultVo> payAgain(@RequestBody @Valid PayAgainParam param) {
+        return null;
+    }
 }

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

 package com.liquidnet.service.goblin.controller;
 
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinFrontSelectGoodVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinShowStoreInfoVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiGoodVo;
 import com.liquidnet.service.goblin.service.IGoblinAppZhengzaiService;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
@@ -35,4 +37,17 @@ public class GoblinAppZhengzaiController {
     public ResponseDto<List<GoblinShowStoreInfoVo>> getStoreList(@RequestParam("marketId") @Valid String marketId) {
         return ResponseDto.success(goblinAppZhengzaiService.getStoreList(marketId));
     }
+
+    @GetMapping("spu/list")
+    @ApiOperation("正在下单-参与活动的spu")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "marketId", value = "活动id", example = "1"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "商铺id", example = "1"),
+    })
+    public ResponseDto<List<GoblinZhengzaiGoodVo>> getStoreList(@RequestParam("marketId") @Valid String marketId,
+                                                                @RequestParam("storeId") @Valid String storeId) {
+        return ResponseDto.success(goblinAppZhengzaiService.getSpuList(marketId, storeId));
+    }
+
+
 }

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

@@ -2,8 +2,6 @@ package com.liquidnet.service.goblin.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.google.gson.JsonObject;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.adam.dto.vo.AdamRscPolymer01Vo;
@@ -11,21 +9,24 @@ import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.UserPathDto;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
-import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderSkuParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderStoreParam;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinPayInnerResultVo;
-import com.liquidnet.service.goblin.dto.manage.vo.SyncOrderParam;
+import com.liquidnet.service.goblin.dto.vo.GoblinOrderAttrVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinOrderSkuVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderVo;
+import com.liquidnet.service.goblin.param.PayAgainParam;
+import com.liquidnet.service.goblin.param.SyncOrderParam;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
 import com.liquidnet.service.goblin.entity.GoblinOrderAttr;
 import com.liquidnet.service.goblin.entity.GoblinOrderSku;
 import com.liquidnet.service.goblin.entity.GoblinStoreOrder;
 import com.liquidnet.service.goblin.service.IGoblinAppOrderService;
 import com.liquidnet.service.goblin.util.*;
-import io.github.classgraph.json.JSONUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -174,6 +175,7 @@ public class GoblinAppOrderServiceImpl implements IGoblinAppOrderService {
         BigDecimal storeTotalPrice = BigDecimal.ZERO;//订单总金额
         BigDecimal voucherMarket = BigDecimal.ZERO;//活动优惠金额
         String writeOffCode = ""; //取货码
+        List<GoblinOrderSkuVo> goblinOrderSkuVoList = ObjectUtil.getGoblinOrderSkuVoArrayList();
         for (GoblinOrderSkuParam skuParam : storeParam.getGoblinOrderSkuParamArrayList()) {
             String pre = GoblinStatusConst.MarketPreStatus.getPre(skuParam.getSkuId());
             GoblinGoodsSkuInfoVo skuVo = redisUtils.getGoodsSkuInfoVo(skuParam.getSkuId());
@@ -216,6 +218,10 @@ public class GoblinAppOrderServiceImpl implements IGoblinAppOrderService {
             orderSku.setSkuSpecs(JSON.toJSONString(skuVo.getSkuSpecList()));
             orderSku.setPriceVoucher(priceBase.subtract(price));
             orderSku.setCreatedAt(now);
+            //订单 orderSku Vo
+            GoblinOrderSkuVo orderSkuVo = GoblinOrderSkuVo.getNew();
+            BeanUtils.copyProperties(orderSku, orderSkuVo);
+            goblinOrderSkuVoList.add(orderSkuVo);
         }
         //优惠券
         BigDecimal voucherPrice = BigDecimal.ZERO;
@@ -330,6 +336,13 @@ public class GoblinAppOrderServiceImpl implements IGoblinAppOrderService {
         }
 
         //todo vo redisList
+        //订单vo
+        GoblinStoreOrderVo orderVo = GoblinStoreOrderVo.getNew();
+        BeanUtils.copyProperties(storeOrder, orderVo);
+        //订单attr vo
+        GoblinOrderAttrVo orderAttrVo = GoblinOrderAttrVo.getNew();
+        BeanUtils.copyProperties(orderAttr, orderAttrVo);
+
         log.info(UserPathDto.setData("下单(唤起支付)", param, payInnerResultVo));
         if (isFree) {
             SyncOrderParam syncOrderParam = SyncOrderParam.getNew();
@@ -340,10 +353,20 @@ public class GoblinAppOrderServiceImpl implements IGoblinAppOrderService {
             syncOrderParam.setPaymentId("FREE_PAYMENT_ID");
             syncOrderParam.setPaymentType(null);
             syncOrderParam.setStatus(1);
-//            syncOrder(syncOrderParam);
+            syncOrder(syncOrderParam);
             return ResponseDto.success(payInnerResultVo);
         } else {
             return ResponseDto.success(payInnerResultVo);
         }
     }
+
+    @Override
+    public ResponseDto<GoblinPayInnerResultVo> payAgain(PayAgainParam param) {
+        return null;
+    }
+
+    @Override
+    public ResponseDto<GoblinPayInnerResultVo> syncOrder(SyncOrderParam syncOrderParam) {
+        return null;
+    }
 }

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

 package com.liquidnet.service.goblin.service.impl;
 
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
-import com.liquidnet.service.goblin.dto.vo.GoblinMarketRelationVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinShowStoreInfoVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinStoreInfoVo;
+import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.service.IGoblinAppZhengzaiService;
 import com.liquidnet.service.goblin.util.GoblinMongoUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
@@ -59,4 +56,20 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
         }
         return voList;
     }
+
+    @Override
+    public List<GoblinZhengzaiGoodVo> getSpuList(String marketId, String storeId) {
+        List<GoblinMarketRelationVo> relationVo = redisUtils.getMarketRelation(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), marketId);
+        List<String> spuIdList = relationVo.stream().map(GoblinMarketRelationVo::getSpuId).collect(Collectors.toList());
+        List<GoblinZhengzaiGoodVo> voList = ObjectUtil.getGoblinZhengzaiGoodVoArrayList();
+        for (String spuId : spuIdList) {
+            GoblinGoodsInfoVo vo = redisUtils.getGoodsInfoVo(spuId);
+            if (vo.getStatus().equals("3")) {
+                GoblinZhengzaiGoodVo returnVo = GoblinZhengzaiGoodVo.getNew();
+                BeanUtils.copyProperties(vo, returnVo);
+                voList.add(returnVo);
+            }
+        }
+        return voList;
+    }
 }

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

@@ -112,7 +112,6 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
         LocalDateTime now = LocalDateTime.now();
         String marketSpuId = params.getSpuId().concat(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue()).concat(IDGenerator.marketGoodId(params.getSelfMarketId()));
         GoblinMarketRelationVo relationVo = GoblinMarketRelationVo.getNew();
-        relationVo.setSpuId(params.getSpuId());
         List<String> skuList = CollectionUtil.arrayListString();//skuId数组
         List<String> marketSkuList = CollectionUtil.arrayListString();//活动skuId数组
         List<String> errorNameList = CollectionUtil.arrayListString();//修改失败的款式名称数组
@@ -161,7 +160,7 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
             sqlsData.add(new Object[]{zhengzaiId, bean.getSelfMarketId(), bean.getSpuId(), bean.getSpuId(), bean.getStoreId(), bean.getPriceMarketing(),
                     bean.getStockMarketing(), bean.getBuyFactor(), bean.getBuyRoster(), bean.getBuyLimit(), bean.getDelFlag(), bean.getCreatedAt()});
             marketSkuList.add(skuVo.getSkuId());
-            skuList.add(item.getSkuId());
+            skuList.add(skuVo.getSkuId());
             priceList.add(item.getPriceMarketing());
         }
         if (errorNameList.size() == params.getGoblinStoreZhengzaiItemParams().size()) {
@@ -180,6 +179,7 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
         //redis
         redisUtils.setGoodsInfoVo(spuVo);
         relationVo.setSkuList(skuList);
+        relationVo.setSpuId(spuVo.getSpuId());
         redisUtils.addMarketRelation(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), params.getSelfMarketId(), relationVo);
         redisUtils.addStoreMarketIsConfig(params.getSelfMarketId(), params.getStoreId(), params.getSpuId(), marketSpuId);
         // 执行sql
@@ -282,7 +282,7 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
         mongoUtils.delGoodsInfoVo(marketSpuId);
         //redis
         redisUtils.delGoodsInfoVo(marketSpuId);
-        redisUtils.removeMarketRelation(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), marketId, spuId);
+        redisUtils.removeMarketRelation(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), marketId, marketSpuId);
         redisUtils.delStoreMarketIsConfig(marketId, storeId, spuId, marketSpuId);
         //库存处理
         GoblinGoodsInfoVo marketVo = redisUtils.getGoodsInfoVo(marketSpuId);

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

@@ -29,9 +29,9 @@ public class ObjectUtil {
     private static final ArrayList<GoblinStorePurchaseSkuVo> goblinStorePurchaseSkuVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinSelfZhengzaiSkuVo> goblinSelfZhengzaiSkuVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinShowStoreInfoVo> goblinShowStoreInfoVoArrayList = new ArrayList<>();
-    private static final ArrayList<AdamEntersVo> arrayListObject = new ArrayList<>();
     private static final ArrayList<GoblinGoodsInfoVo> goblinGoodsInfoVos = new ArrayList<>();
-
+    private static final ArrayList<GoblinZhengzaiGoodVo> goblinZhengzaiGoodVoArrayList = new ArrayList<>();
+    private static final ArrayList<GoblinOrderSkuVo> goblinOrderSkuVoArrayList = new ArrayList<>();
 
     private static final BasicDBObject basicDBObject = new BasicDBObject();
 
@@ -43,14 +43,18 @@ public class ObjectUtil {
         return (ArrayList<GoblinGoodsInfoVo>) goblinGoodsInfoVos.clone();
     }
 
-    public static ArrayList<AdamEntersVo> cloneArrayListObject() {
-        return (ArrayList<AdamEntersVo>) arrayListObject.clone();
+    public  static  ArrayList<GoblinOrderSkuVo> getGoblinOrderSkuVoArrayList(){
+        return (ArrayList<GoblinOrderSkuVo>) goblinOrderSkuVoArrayList.clone();
     }
 
     public static ArrayList<GoblinShowStoreInfoVo> getGoblinShowStoreInfoVoArrayList() {
         return (ArrayList<GoblinShowStoreInfoVo>) goblinShowStoreInfoVoArrayList.clone();
     }
 
+    public static ArrayList<GoblinZhengzaiGoodVo> getGoblinZhengzaiGoodVoArrayList() {
+        return (ArrayList<GoblinZhengzaiGoodVo>) goblinZhengzaiGoodVoArrayList.clone();
+    }
+
     public static ArrayList<GoblinGoodsInfoVo> goblinGoodsInfoVoArrayList() {
         return (ArrayList<GoblinGoodsInfoVo>) goblinGoodsInfoVoArrayList.clone();
     }