混合售订单相关 提供文档

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/MixOrderParam.java

+package com.liquidnet.service.goblin.dto.manage;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@ApiModel(value = "MixOrderParam")
+@Data
+public class MixOrderParam {
+
+    @ApiModelProperty(value = "用户id")
+    private String uid;
+    @ApiModelProperty(value = "混合售id")
+    private String mixId;
+    @ApiModelProperty(value = "入场人地址vo")
+    private AddressVo addressesVo;
+    @ApiModelProperty(value = "支付类型")
+    @NotNull(message = "支付类型不能为空")
+    private String payType;
+    @ApiModelProperty(value = "支付来源 [新增micropay-微信扫码支付]")
+    @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/service/IMixOrderService.java

+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.MixOrderParam;
+import com.liquidnet.service.goblin.dto.vo.GoblinPayInnerResultVo;
+import com.liquidnet.service.goblin.param.PayAgainParam;
+import com.liquidnet.service.goblin.param.RefundCallbackParam;
+import com.liquidnet.service.goblin.param.SyncOrderParam;
+
+import javax.servlet.http.HttpServletRequest;
+
+public interface IMixOrderService {
+
+    ResponseDto<GoblinPayInnerResultVo> checkOrder(MixOrderParam param, String uid);
+
+    String syncOrder(SyncOrderParam syncOrderParam);
+
+//    String refundSyncOrder(RefundCallbackParam refundCallbackParam);
+
+    ResponseDto<Integer> checkOrderResult(String orderId);
+
+    ResponseDto<Integer> checkOrderResultMaterCode(String materCode);
+
+
+}

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

 package com.liquidnet.service.goblin.controller;
 
-import com.github.pagehelper.PageInfo;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.vo.*;
-import com.liquidnet.service.goblin.param.GoblinMixDetailsParam;
-import com.liquidnet.service.goblin.param.GoblinMixUpdateParam;
 import com.liquidnet.service.goblin.service.manage.IGoblinMixAppService;
-import com.liquidnet.service.goblin.service.manage.IGoblinMixService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -17,7 +13,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -26,7 +21,7 @@ import java.util.List;
 @ApiSupport(order = 149201)
 @Slf4j
 @RestController
-@Api(tags = "活动-混合售")
+@Api(tags = "前端-混合售")
 @RequestMapping("app/mix")
 public class GoblinMixAppController {
 

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/MixOrderController.java

+package com.liquidnet.service.order.controller;
+
+import com.liquidnet.commons.lang.util.CurrentUtil;
+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.MixOrderParam;
+import com.liquidnet.service.goblin.dto.vo.GoblinPayInnerResultVo;
+import com.liquidnet.service.goblin.param.PayAgainParam;
+import com.liquidnet.service.goblin.param.RefundCallbackParam;
+import com.liquidnet.service.goblin.param.SyncOrderParam;
+import com.liquidnet.service.goblin.service.IGoblinOrderService;
+import com.liquidnet.service.goblin.service.IMixOrderService;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
+@Slf4j
+@Api(tags = "混合售-支付相关")
+@RestController
+@RequestMapping("/mix")
+public class MixOrderController {
+
+    @Autowired
+    IMixOrderService mixOrderService;
+
+    @PostMapping("pre")
+    @ApiOperation("下单")
+    public ResponseDto<GoblinPayInnerResultVo> checkOrder(@RequestBody EncryptedReq<MixOrderParam> param) {
+        MixOrderParam payOrderParam = param.getData();
+        String uid = CurrentUtil.getCurrentUid();
+        return mixOrderService.checkOrder(payOrderParam, uid);
+    }
+
+    @PostMapping("fc7bce6d6c2213b866f76493f92224b7")
+    @ApiOperation("fc7bce6d6c2213b866f76493f92224b7")
+    public ResponseDto<GoblinPayInnerResultVo> checkOrder(@RequestBody MixOrderParam param) {
+        String uid = CurrentUtil.getCurrentUid();
+        return mixOrderService.checkOrder(param, uid);
+    }
+
+    @PostMapping("syncOrder")
+    @ApiOperation("支付回调")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public String syncOrder(@ModelAttribute @Valid SyncOrderParam syncOrderParam) {
+        return mixOrderService.syncOrder(syncOrderParam);
+    }
+
+//    @ApiOperation(value = "退款回调")
+//    @PostMapping(value = "refundSyncOrder")
+//    public String refundSyncOrder(RefundCallbackParam refundCallbackParam) {
+//        return mixOrderService.refundSyncOrder(refundCallbackParam);
+//    }
+
+//    @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);
+//    }
+
+    @PostMapping("checkPaymentMaster")
+    @ApiOperation("订单状态[主订单号]")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "masterCode", value = "masterCode", example = "1"),
+    })
+    public ResponseDto<Integer> checkOrderResultMasterCode(@RequestParam("masterCode") @Valid String masterCode) {
+        return mixOrderService.checkOrderResultMaterCode(masterCode);
+    }
+
+
+}

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/MixOrderServiceImpl.java

+package com.liquidnet.service.order.service.impl;
+
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
+import com.liquidnet.service.goblin.dto.manage.MixOrderParam;
+import com.liquidnet.service.goblin.dto.vo.GoblinPayInnerResultVo;
+import com.liquidnet.service.goblin.param.SyncOrderParam;
+import com.liquidnet.service.goblin.service.IMixOrderService;
+import com.liquidnet.service.order.utils.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+
+@Service
+@Slf4j
+public class MixOrderServiceImpl implements IMixOrderService {
+
+    @Autowired
+    GoblinRedisUtils redisUtils;
+    @Autowired
+    GoblinMongoUtils mongoUtils;
+    @Autowired
+    GoblinOrderUtils orderUtils;
+    @Autowired
+    GoblinNftOrderUtils nftOrderUtils;
+    @Autowired
+    QueueUtils queueUtils;
+
+    @Value("${liquidnet.service.order.url}")
+    private String orderUrl;
+
+    @Override
+    public ResponseDto<GoblinPayInnerResultVo> checkOrder(MixOrderParam param, String uid) {
+        return null;
+    }
+
+    @Override
+    public String syncOrder(SyncOrderParam syncOrderParam) {
+        return null;
+    }
+
+    @Override
+    public ResponseDto<Integer> checkOrderResult(String orderId) {
+        return null;
+    }
+
+    @Override
+    public ResponseDto<Integer> checkOrderResultMaterCode(String materCode) {
+        return null;
+    }
+}