Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

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

@@ -49,6 +49,9 @@ public class GoblinRedisConst {
 
     public static final String REDIS_GOBLIN_BUY_COUNT = PREFIX.concat("uid:");//用户sku购买数量 key:uid:skuId:$skuId
     public static final String REDIS_GOBLIN_SALE_COUNT = PREFIX.concat("sale:skuId:");//用户sku购买数量 key:sale:skuId:$skuId
+    public static final String REDIS_GOBLIN_ORDER = PREFIX.concat("order:");//用户sku购买数量 key:$orderId
+    public static final String REDIS_GOBLIN_ORDER_UN_PAY = PREFIX.concat("order:un:pay:");//未支付订单id列表 key:$randomKey
+    public static final String REDIS_GOBLIN_ORDER_LIST = PREFIX.concat("order:id:list:");//用户订单id列表 key:$uid
     /* ----------------------------------------------------------------- */
     /**
      * SKU剩余库存

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

@@ -26,18 +26,24 @@ public class GoblinStatusConst {
     }
 
     public enum OrderStatus {
-        ORDER_STATUS_1("1", "订单状态"),
+        ORDER_STATUS_0(0, "待付款(用户刚下单)"),
+        ORDER_STATUS_2(2, "代发货(用户付完款 等待商城发货)"),
+        ORDER_STATUS_3(3, "代收货(商城已经发货 等待用户确认收货)"),
+        ORDER_STATUS_4(4, "已完成(用户已经确认收货 订单结束)"),
+        ORDER_STATUS_5(5, "取消订单(用户未付款前取消订单)"),
+        ORDER_STATUS_6(6, "退款通过(用户已经付款但是商城还未发货，用户发出退款申请，商城同意退款)"),
+        ORDER_STATUS_7(7, "退货通过(用户已经确认收货后用户发出退货申请，商城同意所有退货申请 ，一个订单可能有多个单品)"),
         ;
 
-        private final String value;
+        private final int value;
         private final String desc;
 
-        OrderStatus(String value, String desc) {
+        OrderStatus(int value, String desc) {
             this.value = value;
             this.desc = desc;
         }
 
-        public String getValue() {
+        public int getValue() {
             return value;
         }
 

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

@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -62,6 +63,8 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
     private String ucouponId;
     @ApiModelProperty(value = " 支付类型[wepay-微信支付|alipay-阿里支付|douyinpay-抖音支付|unionpay-银联支付]")
     private String payType;
+    @ApiModelProperty(value = " 支付来源")
+    private String deviceFrom;
     @ApiModelProperty(value = " 取消原因")
     private String cancelReason;
     @ApiModelProperty(value = " 订单来源[app|h5|applet]")
@@ -96,10 +99,16 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
     private String logisticsCompany;
     @ApiModelProperty(value = " 物流公司code[物流公司id]")
     private String logisticsCode;
+    @ApiModelProperty(value = " ip")
+    private String ipAddress;
     @ApiModelProperty(value = " 创建时间")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime createdAt;
 
+    @ApiModelProperty(value = "orderAttr")
+    private GoblinOrderAttrVo orderAttrVo;
+    @ApiModelProperty(value = "orderSku")
+    private List<GoblinOrderSkuVo> orderSkuVos;
 
     private static final GoblinStoreOrderVo obj = new GoblinStoreOrderVo();
 

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

@@ -7,6 +7,8 @@ import java.math.BigDecimal;
 
 @Data
 public class SyncOrderParam implements Cloneable {
+    @ApiModelProperty(value = "orderId")
+    private String orderId;
     @ApiModelProperty(value = "status")
     private Integer status;
     @ApiModelProperty(value = "type")
@@ -17,6 +19,8 @@ public class SyncOrderParam implements Cloneable {
     private String paymentId;
     @ApiModelProperty(value = "orderCode")
     private String orderCode;
+    @ApiModelProperty(value = "orderCodeId")
+    private String orderCodeId;
     @ApiModelProperty(value = "price")
     private BigDecimal price;
     @ApiModelProperty(value = "paymentType")

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

@@ -12,6 +12,7 @@ public interface IGoblinAppOrderService {
 
     ResponseDto<GoblinPayInnerResultVo> payAgain(PayAgainParam param);
 
-    ResponseDto<GoblinPayInnerResultVo> syncOrder(SyncOrderParam syncOrderParam);
+    String syncOrder(SyncOrderParam syncOrderParam);
 
+    ResponseDto<Integer> checkOrderResult(String orderId);
 }

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

 package com.liquidnet.service.goblin.service;
 
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiGoodVo;
+
+import java.util.List;
+
 public interface IGoblinStoreZhengzaiService {
 
+    /**
+     * 正在下单活动列表
+     *
+     * @return
+     */
+    ResponseDto<List<GoblinSelfMarketingVo>> getZhengzaiMarketList();
+
+    /**
+     * 正在下单 商铺参与活动的商品列表
+     * @param marketId
+     * @return
+     */
+    ResponseDto<List<GoblinZhengzaiGoodVo>> getSpuList(String marketId);
+
 }

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/MQConst.java

@@ -203,6 +203,9 @@ public class MQConst {
     public enum GoblinQueue {
         GOBLIN_STORE_MARKET("goblin:stream:store.market", "group.store.market", "店铺活动"),
         GOBLIN_SELF_MARKET("goblin:stream:self.market", "group.self.market", "平台活动"),
+        GOBLIN_ORDER_CREATE_PAY("goblin:stream:order:create_pay", "group.order:create_pay", "订单创建&支付"),
+        GOBLIN_ORDER_AGAIN("goblin:stream:order:again", "group.order:again", "订单再次支付"),
+        GOBLIN_ORDER_CLOSE("goblin:stream:order:close", "group.order:close", "订单关闭"),
         ;
 
         private final String key;

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinStoreOrder.java

@@ -150,6 +150,10 @@ public class GoblinStoreOrder implements Serializable,Cloneable {
      */
     private String payType;
 
+    /**
+     * 支付来源
+     */
+    private String deviceFrom;
     /**
      * 取消原因
      */

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/config/ConsumerGoblinOrderAGRedisStreamConfig.java

+package com.liquidnet.service.consumer.goblin.config;
+
+import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.consumer.goblin.receiver.ConsumerGoblinOrderAGRdsReceiver;
+import com.liquidnet.service.consumer.goblin.receiver.ConsumerGoblinOrderCPRdsReceiver;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.stream.Consumer;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.ReadOffset;
+import org.springframework.data.redis.connection.stream.StreamOffset;
+import org.springframework.data.redis.stream.StreamMessageListenerContainer;
+import org.springframework.data.redis.stream.Subscription;
+
+import java.time.Duration;
+
+
+@Configuration
+public class ConsumerGoblinOrderAGRedisStreamConfig {
+    @Autowired
+    ConsumerGoblinOrderAGRdsReceiver consumerGoblinOrderAGRdsReceiver;
+
+    private StreamMessageListenerContainer<String, MapRecord<String, String, String>> buildStreamMessageListenerContainer(RedisConnectionFactory factory) {
+        var options = StreamMessageListenerContainer
+                .StreamMessageListenerContainerOptions
+                .builder()
+                .pollTimeout(Duration.ofMillis(1))
+                .build();
+        return StreamMessageListenerContainer.create(factory, options);
+    }
+
+    /**
+     * 缺票登记
+     *
+     * @param listenerContainer
+     * @param t
+     * @return
+     */
+    private Subscription receiveGoblinOrderAG(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
+        return listenerContainer.receiveAutoAck(
+                Consumer.from(MQConst.GoblinQueue.GOBLIN_ORDER_AGAIN.getGroup(), MQConst.GoblinQueue.GOBLIN_ORDER_AGAIN.name() + t),
+                StreamOffset.create(MQConst.GoblinQueue.GOBLIN_ORDER_AGAIN.getKey(), ReadOffset.lastConsumed()), consumerGoblinOrderAGRdsReceiver
+        );
+    }
+
+    /* —————————————————————————— ｜ —————————————————————————— ｜ —————————————————————————— */
+
+    /* -------------------------------------------------------- ｜ 缺票登记 */
+
+    @Bean
+    public Subscription subscriptionGoblinOrderAG(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveGoblinOrderAG(listenerContainer, 1);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionGoblinOrderAG2(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveGoblinOrderAG(listenerContainer, 2);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionGoblinOrderAG3(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveGoblinOrderAG(listenerContainer, 3);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    /* -------------------------------------------------------- ｜  */
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/config/ConsumerGoblinOrderCPRedisStreamConfig.java

+package com.liquidnet.service.consumer.goblin.config;
+
+import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.consumer.goblin.receiver.ConsumerGoblinOrderCPRdsReceiver;
+import com.liquidnet.service.consumer.goblin.receiver.ConsumerGoblinSelfMarketRdsReceiver;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.stream.Consumer;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.ReadOffset;
+import org.springframework.data.redis.connection.stream.StreamOffset;
+import org.springframework.data.redis.stream.StreamMessageListenerContainer;
+import org.springframework.data.redis.stream.Subscription;
+
+import java.time.Duration;
+
+
+@Configuration
+public class ConsumerGoblinOrderCPRedisStreamConfig {
+    @Autowired
+    ConsumerGoblinOrderCPRdsReceiver consumerGoblinOrderCPRdsReceiver;
+
+    private StreamMessageListenerContainer<String, MapRecord<String, String, String>> buildStreamMessageListenerContainer(RedisConnectionFactory factory) {
+        var options = StreamMessageListenerContainer
+                .StreamMessageListenerContainerOptions
+                .builder()
+                .pollTimeout(Duration.ofMillis(1))
+                .build();
+        return StreamMessageListenerContainer.create(factory, options);
+    }
+
+    /**
+     * 缺票登记
+     *
+     * @param listenerContainer
+     * @param t
+     * @return
+     */
+    private Subscription receiveGoblinOrderCP(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
+        return listenerContainer.receiveAutoAck(
+                Consumer.from(MQConst.GoblinQueue.GOBLIN_ORDER_CREATE_PAY.getGroup(), MQConst.GoblinQueue.GOBLIN_ORDER_CREATE_PAY.name() + t),
+                StreamOffset.create(MQConst.GoblinQueue.GOBLIN_ORDER_CREATE_PAY.getKey(), ReadOffset.lastConsumed()), consumerGoblinOrderCPRdsReceiver
+        );
+    }
+
+    /* —————————————————————————— ｜ —————————————————————————— ｜ —————————————————————————— */
+
+    /* -------------------------------------------------------- ｜ 缺票登记 */
+
+    @Bean
+    public Subscription subscriptionGoblinOrderCP(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveGoblinOrderCP(listenerContainer, 1);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionGoblinOrderCP2(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveGoblinOrderCP(listenerContainer, 2);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionGoblinOrderCP3(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveGoblinOrderCP(listenerContainer, 3);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    /* -------------------------------------------------------- ｜  */
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/config/ConsumerGoblinSelfMarketRedisStreamConfig.java

+package com.liquidnet.service.consumer.goblin.config;
+
+import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.consumer.goblin.receiver.ConsumerGoblinSelfMarketRdsReceiver;
+import com.liquidnet.service.consumer.goblin.receiver.ConsumerGoblinStoreMarketRdsReceiver;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.stream.Consumer;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.ReadOffset;
+import org.springframework.data.redis.connection.stream.StreamOffset;
+import org.springframework.data.redis.stream.StreamMessageListenerContainer;
+import org.springframework.data.redis.stream.Subscription;
+
+import java.time.Duration;
+
+
+@Configuration
+public class ConsumerGoblinSelfMarketRedisStreamConfig {
+    @Autowired
+    ConsumerGoblinSelfMarketRdsReceiver consumerGoblinSelfMarketRdsReceiver;
+
+    private StreamMessageListenerContainer<String, MapRecord<String, String, String>> buildStreamMessageListenerContainer(RedisConnectionFactory factory) {
+        var options = StreamMessageListenerContainer
+                .StreamMessageListenerContainerOptions
+                .builder()
+                .pollTimeout(Duration.ofMillis(1))
+                .build();
+        return StreamMessageListenerContainer.create(factory, options);
+    }
+
+    /**
+     * 缺票登记
+     *
+     * @param listenerContainer
+     * @param t
+     * @return
+     */
+    private Subscription receiveGoblinSelfMarket(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
+        return listenerContainer.receiveAutoAck(
+                Consumer.from(MQConst.GoblinQueue.GOBLIN_SELF_MARKET.getGroup(), MQConst.GoblinQueue.GOBLIN_SELF_MARKET.name() + t),
+                StreamOffset.create(MQConst.GoblinQueue.GOBLIN_SELF_MARKET.getKey(), ReadOffset.lastConsumed()), consumerGoblinSelfMarketRdsReceiver
+        );
+    }
+
+    /* —————————————————————————— ｜ —————————————————————————— ｜ —————————————————————————— */
+
+    /* -------------------------------------------------------- ｜ 缺票登记 */
+
+    @Bean
+    public Subscription subscriptionGoblinSelfMarket(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveGoblinSelfMarket(listenerContainer, 1);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionGoblinSelfMarket2(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveGoblinSelfMarket(listenerContainer, 2);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionGoblinSelfMarket3(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveGoblinSelfMarket(listenerContainer, 3);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    /* -------------------------------------------------------- ｜  */
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/receiver/ConsumerGoblinOrderAGRdsReceiver.java

+package com.liquidnet.service.consumer.goblin.receiver;
+
+import com.liquidnet.service.base.constant.MQConst;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ConsumerGoblinOrderAGRdsReceiver extends AbstractSqlRedisReceiver {
+    @Override
+    protected String getRedisStreamKey() {
+        return MQConst.GoblinQueue.GOBLIN_ORDER_AGAIN.getKey();
+    }
+
+    @Override
+    protected String getRedisStreamGroup() {
+        return MQConst.GoblinQueue.GOBLIN_ORDER_AGAIN.getGroup();
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/receiver/ConsumerGoblinOrderCPRdsReceiver.java

+package com.liquidnet.service.consumer.goblin.receiver;
+
+import com.liquidnet.service.base.constant.MQConst;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ConsumerGoblinOrderCPRdsReceiver extends AbstractSqlRedisReceiver {
+    @Override
+    protected String getRedisStreamKey() {
+        return MQConst.GoblinQueue.GOBLIN_ORDER_CREATE_PAY.getKey();
+    }
+
+    @Override
+    protected String getRedisStreamGroup() {
+        return MQConst.GoblinQueue.GOBLIN_ORDER_CREATE_PAY.getGroup();
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/receiver/ConsumerGoblinSelfMarketRdsReceiver.java

+package com.liquidnet.service.consumer.goblin.receiver;
+
+import com.liquidnet.service.base.constant.MQConst;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ConsumerGoblinSelfMarketRdsReceiver extends AbstractSqlRedisReceiver {
+    @Override
+    protected String getRedisStreamKey() {
+        return MQConst.GoblinQueue.GOBLIN_SELF_MARKET.getKey();
+    }
+
+    @Override
+    protected String getRedisStreamGroup() {
+        return MQConst.GoblinQueue.GOBLIN_SELF_MARKET.getGroup();
+    }
+}

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/redis_queue_create.txt

@@ -2,4 +2,13 @@ XADD goblin:stream:store.market * 0 0
 XGROUP CREATE goblin:stream:store.market group.store.market 0
 
 XADD goblin:stream:self.market * 0 0
-XGROUP CREATE goblin:stream:self.market group.self.market 0
+XGROUP CREATE goblin:stream:self.market group.self.market 0
\ No newline at end of file
+
+XADD goblin:stream:order:create_pay * 0 0
+XGROUP CREATE goblin:stream:order:create_pay group.order:create_pay 0
+
+XADD goblin:stream:order:again * 0 0
+XGROUP CREATE goblin:stream:order:again group.order:again 0
+
+XADD goblin:stream:order:close * 0 0
+XGROUP CREATE goblin:stream:order:close group.order:close 0
\ No newline at end of file

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

@@ -7,9 +7,7 @@ import com.liquidnet.service.goblin.dto.manage.vo.GoblinPayInnerResultVo;
 import com.liquidnet.service.goblin.param.PayAgainParam;
 import com.liquidnet.service.goblin.param.SyncOrderParam;
 import com.liquidnet.service.goblin.service.IGoblinAppOrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -49,6 +47,16 @@ public class GoblinAppOrderController {
     @ApiOperation("再次支付")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<GoblinPayInnerResultVo> payAgain(@RequestBody @Valid PayAgainParam param) {
-        return null;
+        return goblinAppOrderService.payAgain(param);
+    }
+
+    @PostMapping("checkPayment")
+    @ApiOperation("订单状态")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "订单id", example = "1"),
+    })
+    public ResponseDto<Integer> checkOrderResult(@RequestParam("orderId") @Valid String orderId) {
+        return goblinAppOrderService.checkOrderResult(orderId);
     }
 }

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

 package com.liquidnet.service.goblin.controller;
 
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiGoodVo;
 import com.liquidnet.service.goblin.service.IGoblinStoreZhengzaiService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 @Slf4j
-@Api(tags = "正在下单相关")
+@Api(tags = "正在下单相关-商铺")
 @RestController
-@RequestMapping("/zhengzai")
+@RequestMapping("/zhengzai/store")
 public class GoblinStoreZhengzaiController {
 
     @Autowired
     IGoblinStoreZhengzaiService goblinStoreZhengzaiService;
 
+    @GetMapping("market/list")
+    @ApiOperation("正在下单-活动列表")
+    public ResponseDto<List<GoblinSelfMarketingVo>> getZhengzaiMarketList() {
+        return goblinStoreZhengzaiService.getZhengzaiMarketList();
+    }
+
+    @GetMapping("spu/list")
+    @ApiOperation("正在下单-参与活动的spu")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "marketId", value = "活动id", example = "1"),
+    })
+    public ResponseDto<List<GoblinZhengzaiGoodVo>> getStoreList(@RequestParam("marketId") @Valid String marketId) {
+        return goblinStoreZhengzaiService.getSpuList(marketId);
+    }
 }

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

@@ -64,7 +64,7 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
         List<GoblinZhengzaiGoodVo> voList = ObjectUtil.getGoblinZhengzaiGoodVoArrayList();
         for (String spuId : spuIdList) {
             GoblinGoodsInfoVo vo = redisUtils.getGoodsInfoVo(spuId);
-            if (vo.getStatus().equals("3")) {
+            if (vo.getStatus().equals("3") && storeId.equals(vo.getStoreId())) {
                 GoblinZhengzaiGoodVo returnVo = GoblinZhengzaiGoodVo.getNew();
                 BeanUtils.copyProperties(vo, returnVo);
                 voList.add(returnVo);

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

 package com.liquidnet.service.goblin.service.impl;
 
+import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.constant.GoblinStatusConst;
+import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.service.IGoblinStoreZhengzaiService;
 import com.liquidnet.service.goblin.util.GoblinMongoUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
+import com.liquidnet.service.goblin.util.ObjectUtil;
 import com.liquidnet.service.goblin.util.QueueUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
+
 @Service
 public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiService {
 
@@ -17,4 +29,52 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
     @Autowired
     QueueUtils queueUtils;
 
+
+    @Override
+    public ResponseDto<List<GoblinSelfMarketingVo>> getZhengzaiMarketList() {
+        String uid = CurrentUtil.getCurrentUid();
+        GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVoByUid(uid);
+        if (storeInfoVo == null) {
+            return ResponseDto.failure("店铺不存在");
+        }
+        String storeId = storeInfoVo.getStoreId();
+        List<String> marketIds = redisUtils.getStoreZhengzaiRelation(storeId);//可参加的正在活动id
+        List<GoblinSelfMarketingVo> list = redisUtils.getGoblinSelfMarketingVoList();//所有正在下单活动列表
+        List<GoblinSelfMarketingVo> voList = ObjectUtil.getGoblinSelfMarketingVoList();
+        LocalDateTime now = LocalDateTime.now();
+        for (GoblinSelfMarketingVo item : list) {
+            if (LocalDateTime.parse(item.getStartTime(), DTF_YMD_HMS).isBefore(now) && LocalDateTime.parse(item.getEndTime(), DTF_YMD_HMS).isAfter(now)) {
+                if (marketIds.contains(item.getSelfMarketId())) {
+                    List<GoblinMarketRelationVo> relationVo = redisUtils.getMarketRelation(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), item.getSelfMarketId());
+                    List<String> storeIdList = relationVo.stream().map(GoblinMarketRelationVo::getStoreId).distinct().collect(Collectors.toList());//配置了商铺的店铺
+                    if (storeIdList.contains(storeId)) {
+                        voList.add(item);
+                    }
+                }
+            }
+        }
+        return ResponseDto.success(voList);
+    }
+
+    @Override
+    public ResponseDto<List<GoblinZhengzaiGoodVo>> getSpuList(String marketId) {
+        String uid = CurrentUtil.getCurrentUid();
+        GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVoByUid(uid);
+        if (storeInfoVo == null) {
+            return ResponseDto.failure("店铺不存在");
+        }
+        String storeId = storeInfoVo.getStoreId();
+        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") && vo.getStoreId().equals(storeId)) {
+                GoblinZhengzaiGoodVo returnVo = GoblinZhengzaiGoodVo.getNew();
+                BeanUtils.copyProperties(vo, returnVo);
+                voList.add(returnVo);
+            }
+        }
+        return ResponseDto.success(voList);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.util;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.RandomUtil;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.dto.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -419,4 +420,77 @@ public class GoblinRedisUtils {
         return (int) redisUtil.decr(redisKey, number);
     }
 
+    // 赋值 订单相关vo
+    public void setGoblinOrder(String orderId,GoblinStoreOrderVo vo){
+        String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER.concat(orderId);
+        redisUtil.set(redisKey,vo);
+    }
+
+    // 赋值 订单相关vo
+    public GoblinStoreOrderVo getGoblinOrder(String orderId){
+        String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER.concat(orderId);
+        Object obj = redisUtil.get(redisKey);
+        if(obj==null){
+            return null;
+        }else{
+            return (GoblinStoreOrderVo) obj;
+        }
+    }
+
+    // 获取 未支付订单id列表
+    public List<String> getUnPayOrder(){
+        int randomKey=RandomUtil.getRandomInt(0,100);
+        String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_UN_PAY.concat(randomKey+"");
+        Object obj = redisUtil.get(redisKey);
+        if(obj==null){
+            return CollectionUtil.arrayListString();
+        }else{
+            return (List<String>) obj;
+        }
+    }
+
+    // 添加 未支付订单id列表
+    public void addUnPayOrder(String orderId){
+        int randomKey=RandomUtil.getRandomInt(0,100);
+        String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_UN_PAY.concat(randomKey+"");
+        List<String> list = getUnPayOrder();
+        list.add(orderId);
+        redisUtil.set(redisKey,list);
+    }
+
+    // 删除 未支付订单id列表
+    public void removeGoblinOrder(String randomKey ,String orderId){
+        String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_UN_PAY.concat(randomKey+"");
+        List<String> list = getUnPayOrder();
+        list.remove(orderId);
+        redisUtil.set(redisKey,list);
+    }
+
+    // 获取 订单id列表
+    public List<String> getOrderList(String uid){
+        String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_LIST.concat(uid);
+        Object obj = redisUtil.get(redisKey);
+        if(obj==null){
+            return CollectionUtil.arrayListString();
+        }else{
+            return (List<String>) obj;
+        }
+    }
+
+    // 添加 订单id列表
+    public void addOrderList(String uid,String orderId){
+        String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_LIST.concat(uid);
+        List<String> list = getOrderList(uid);
+        list.add(orderId);
+        redisUtil.set(redisKey,list);
+    }
+
+    // 删除 订单id列表
+    public void removeOrderList(String uid ,String orderId){
+        String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_LIST.concat(uid);
+        List<String> list = getOrderList(uid);
+        list.remove(orderId);
+        redisUtil.set(redisKey,list);
+    }
+
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties

+#----                   商铺活动
 goblin.store.market.insert=INSERT INTO goblin_store_marketing (`store_market_id`,`name`,`type`,`status`,`store_id`,`start_time`,`end_time`,`del_flag`,`is_pre`,`pre_time`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?)
 goblin.store.market.status=UPDATE goblin_store_marketing SET status=? , del_flag=? WHERE store_market_id =? and store_id =?
 goblin.store.market.update=UPDATE goblin_store_marketing SET name=?,type=?,status=?,store_id=?,describes=?,start_time=?,end_time=?,del_flag=?,is_pre=?,pre_time=?,updated_at=? WHERE store_market_id =? and store_id =?
 goblin.store.market.insertRelation=INSERT INTO goblin_store_market_purchasing (`purchase_id`,`store_market_id`,`spu_id`,`sku_id`,`store_id`,`price_marketing`,`stock_marketing`,`buy_factor`,`buy_roster`,`buy_limit`,`del_flag`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
 goblin.store.market.updateRelation=UPDATE goblin_store_market_purchasing SET price_marketing=? ,stock_marketing=? , buy_factor=?,buy_roster=?,buy_limit=?,updated_at=? WHERE store_market_id =? and store_id =?
 goblin.store.market.delSpuRelation=UPDATE goblin_store_market_purchasing SET del_flag = ?,updated_at = ? WHERE store_market_id =? and store_id =? and spu_id=?
-
+#----                   平台活动
 goblin.self.market.insertRelation=INSERT INTO goblin_marketing_zhengzai (`zhengzai_id`,`self_market_id`,`spu_id`,`sku_id`,`store_id`,`price_marketing`,`stock_marketing`,`buy_factor`,`buy_roster`,`buy_limit`,`del_flag`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
 goblin.self.market.updateRelation=UPDATE goblin_marketing_zhengzai SET price_marketing=? ,stock_marketing=? , buy_factor=?,buy_roster=?,buy_limit=?,updated_at=? WHERE self_market_id =? and store_id =?
-goblin.self.market.delSpuRelation=UPDATE goblin_marketing_zhengzai SET del_flag = ?,updated_at = ? WHERE self_market_id =? and store_id =? and spu_id=?
+goblin.self.market.delSpuRelation=UPDATE goblin_marketing_zhengzai SET del_flag = ?,updated_at = ? WHERE self_market_id =? and store_id =? and spu_id=?
\ No newline at end of file
+#----                   订单创建&支付
+goblin.order.create.order_insert=INSERT INTO goblin_store_order (`master_order_code`,`order_id`,`store_id`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`price_actual`,`price_refund`,`price_express`,`price_coupon`,`price_voucher`,`status`,`ucoupon_id`,`pay_type`,`device_from`,`source`,`version`,`is_member`,`order_type`,`write_off_code`,`pay_countdown_minute`,`ip_address`,`pay_code`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+goblin.order.create.attr_insert=INSERT INTO goblin_order_attr (`order_attr_id`,`order_id`,`express_contacts`,`express_address`,`express_address_detail`,`express_phone`,`express_type`,`created_at`) VALUES (?,?,?,?,?,?,?,?)
+goblin.order.create.sku_insert=INSERT INTO goblin_order_sku (`order_sku_id`,`order_id`,`spu_id`,`sku_id`,`num`,`sku_price`,`sku_price_actual`,`sku_name`,`sku_no`,`sku_image`,`sku_specs`,`price_voucher`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)
+goblin_order.pay.order = UPDATE goblin_store_order SET pay_type = ? ,device_from = ? ,pay_code = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+goblin_order.pay.sku = UPDATE goblin_store_order SET pay_type = ? ,device_from = ? ,pay_code = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+#----                   再次支付
+goblin_order.pay.again = UPDATE goblin_store_order SET pay_type = ? ,device_from = ? ,pay_code = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+#----                   订单关闭
\ No newline at end of file