增加 masterCode 列表

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

@@ -12,7 +12,9 @@ public interface IGoblinOrderAppService {
 
     ResponseDto<List<GoblinAppOrderListVo>> orderList(int page);
 
-    ResponseDto<GoblinAppOrderDetailsVo> orderDetails(String orderId);
+    ResponseDto<List<GoblinAppOrderListVo>> orderListByMaster(String orderMasterCode);
+
+    ResponseDto<GoblinAppOrderDetailsVo> orderDetails(String orderId,String uid);
 
     ResponseDto<Boolean> applyRefund(GoblinAppOrderRefundParam param);
 }

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.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.service.IGoblinAppZhengzaiService;
+import com.liquidnet.service.goblin.service.IGoblinOrderAppService;
 import com.liquidnet.service.goblin.service.IGoblinOrderService;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
@@ -23,6 +25,8 @@ public class GoblinAppZhengzaiController {
     IGoblinAppZhengzaiService goblinAppZhengzaiService;
     @Autowired
     IGoblinOrderService goblinOrderService;
+    @Autowired
+    IGoblinOrderAppService goblinOrderAppService;
 
     @GetMapping("market/list")
     @ApiOperation("正在下单-活动列表")
@@ -69,6 +73,25 @@ public class GoblinAppZhengzaiController {
         return goblinOrderService.checkOrderResultMaterCode(masterCode);
     }
 
+    @PostMapping("listByCode")
+    @ApiOperation("列表[根据masterCode]")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderMasterCode", value = "主订单号"),
+    })
+    public ResponseDto<List<GoblinAppOrderListVo>> orderListByMaster(@RequestParam("orderMasterCode") @Valid String orderMasterCode) {
+        return goblinOrderAppService.orderListByMaster(orderMasterCode);
+    }
+
+    @PostMapping("details")
+    @ApiOperation("详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "订单id", example = "1"),
+    })
+    public ResponseDto<GoblinAppOrderDetailsVo> orderDetails(@RequestParam("orderId") @Valid String orderId) {
+        String uid = CurrentUtil.getCurrentUid();
+        return goblinOrderAppService.orderDetails(orderId, uid);
+    }
+
     @PostMapping("checkPayment_dup1")
     @ApiOperation("正在下单-出货")
     @ApiResponse(code = 200, message = "接口返回对象参数")
@@ -88,6 +111,6 @@ public class GoblinAppZhengzaiController {
     })
     public ResponseDto<Boolean> orderBind(@RequestParam("masterCode") @Valid String masterCode,
                                           @RequestParam("uid") @Valid String uid) {
-        return goblinAppZhengzaiService.orderBind(uid,masterCode);
+        return goblinAppZhengzaiService.orderBind(uid, masterCode);
     }
 }

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

 package com.liquidnet.service.goblin.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;
@@ -38,18 +39,28 @@ public class GoblinOrderAppController {
         return goblinOrderAppService.orderList(page);
     }
 
+    @PostMapping("listByCode")
+    @ApiOperation("列表[根据masterCode]")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderMasterCode", value = "主订单号"),
+    })
+    public ResponseDto<List<GoblinAppOrderListVo>> orderListByMaster(@RequestParam("orderMasterCode") @Valid String orderMasterCode) {
+        return goblinOrderAppService.orderListByMaster(orderMasterCode);
+    }
+
     @PostMapping("details")
     @ApiOperation("详情")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "订单id", example = "1"),
     })
     public ResponseDto<GoblinAppOrderDetailsVo> orderDetails(@RequestParam("orderId") @Valid String orderId) {
-        return goblinOrderAppService.orderDetails(orderId);
+        String uid = CurrentUtil.getCurrentUid();
+        return goblinOrderAppService.orderDetails(orderId,uid);
     }
 
     @PostMapping("applyRefund")
     @ApiOperation("退款申请")
-    public ResponseDto<Boolean> applyRefund(@RequestBody  GoblinAppOrderRefundParam param) {
+    public ResponseDto<Boolean> applyRefund(@RequestBody GoblinAppOrderRefundParam param) {
         return goblinOrderAppService.applyRefund(param);
     }
 

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

@@ -2,9 +2,8 @@ package com.liquidnet.service.goblin.controller;
 
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
-import com.liquidnet.service.goblin.dto.vo.GoblinPayInnerResultVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiGoodVo;
+import com.liquidnet.service.goblin.dto.vo.*;
+import com.liquidnet.service.goblin.service.IGoblinOrderAppService;
 import com.liquidnet.service.goblin.service.IGoblinOrderService;
 import com.liquidnet.service.goblin.service.IGoblinStoreZhengzaiService;
 import io.swagger.annotations.Api;
@@ -28,6 +27,8 @@ public class GoblinStoreZhengzaiController {
     IGoblinStoreZhengzaiService goblinStoreZhengzaiService;
     @Autowired
     IGoblinOrderService goblinOrderService;
+    @Autowired
+    IGoblinOrderAppService goblinOrderAppService;
 
     @GetMapping("market/list")
     @ApiOperation("正在下单-活动列表")
@@ -52,4 +53,22 @@ public class GoblinStoreZhengzaiController {
         }
         return goblinOrderService.checkOrder(param, param.getUid());
     }
+
+    @PostMapping("listByCode")
+    @ApiOperation("列表[根据masterCode]")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderMasterCode", value = "主订单号"),
+    })
+    public ResponseDto<List<GoblinAppOrderListVo>> orderListByMaster(@RequestParam("orderMasterCode") @Valid String orderMasterCode) {
+        return goblinOrderAppService.orderListByMaster(orderMasterCode);
+    }
+
+    @PostMapping("details")
+    @ApiOperation("详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "订单id", example = "1"),
+    })
+    public ResponseDto<GoblinAppOrderDetailsVo> orderDetails(@RequestParam("orderId") @Valid String orderId) {
+        return goblinOrderAppService.orderDetails(orderId, null);
+    }
 }

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

@@ -71,10 +71,29 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
     }
 
     @Override
-    public ResponseDto<GoblinAppOrderDetailsVo> orderDetails(String orderId) {
-        String uid = CurrentUtil.getCurrentUid();
+    public ResponseDto<List<GoblinAppOrderListVo>> orderListByMaster(String orderMasterCode) {
+        String[] orderIdArray = redisUtils.getMasterCode(orderMasterCode);
+        List<GoblinAppOrderListVo> orderVoList = ObjectUtil.goblinAppOrderListVoArrayList();
+        for (String orderId : orderIdArray) {
+            GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(orderId);
+            GoblinAppOrderListVo vo = GoblinAppOrderListVo.getNew();
+            BeanUtils.copyProperties(orderVo, vo);
+            vo.setRestTime(getRestTime(orderVo));
+            List<GoblinOrderSkuVo> skuVos = ObjectUtil.getGoblinOrderSkuVoArrayList();
+            for (String orderSkuId : orderVo.getOrderSkuVoIds()) {
+                GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(orderSkuId);
+                skuVos.add(orderSkuVo);
+            }
+            vo.setOrderSkuVos(skuVos);
+            orderVoList.add(vo);
+        }
+        return ResponseDto.success(orderVoList);
+    }
+
+    @Override
+    public ResponseDto<GoblinAppOrderDetailsVo> orderDetails(String orderId, String uid) {
         GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(orderId);
-        if (!orderVo.getUserId().equals(uid)) {
+        if (!orderVo.getUserId().equals(uid) && uid != null) {
             return ResponseDto.failure("无权查看");
         }
         GoblinAppOrderDetailsVo vo = GoblinAppOrderDetailsVo.getNew();