Merge branch 'dev_goblin' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev_goblin

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

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -72,4 +73,69 @@ public class GoblinStoreOrderController {
     public ResponseDto<GoblinStoreOrderListVo> orderList(@RequestParam(value = "orderId", required = true) @Valid String orderId) {
         return goblinStoreOrderService.orderDetails(orderId);
     }
+
+    @ApiOperation(value = "修改订单价格")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderId", value = "订单id"),
+    })
+    @GetMapping(value = "change/price")
+    public ResponseDto<Boolean> changePrice(@RequestParam(value = "orderId", required = true) @Valid String orderId) {
+        return ResponseDto.success();
+    }
+
+    @ApiOperation(value = "修改sku价格")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderId", value = "订单id"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderSkuId", value = "orderSkuId"),
+    })
+    @GetMapping(value = "change/skuPrice")
+    public ResponseDto<Boolean> changeSkuPrice(@RequestParam(value = "orderId", required = true) @Valid String orderId,
+                                               @RequestParam(value = "orderSkuId", required = true) @Valid String orderSkuId) {
+        return ResponseDto.success();
+    }
+
+    @ApiOperation(value = "修改收货地址")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderId", value = "订单id"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "expressAddressDetail", value = "详细快递地址"),
+    })
+    @GetMapping(value = "change/address")
+    public ResponseDto<Boolean> changeAddress(@RequestParam(value = "orderId", required = true) @Valid String orderId,
+                                              @RequestParam(value = "expressAddressDetail", required = true) @Valid String expressAddressDetail) {
+        return ResponseDto.success();
+    }
+
+    @ApiOperation(value = "sku退款")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderId", value = "订单id"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderSkuId", value = "详细快递地址"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "BigDecimal", name = "price", value = "退款金额"),
+    })
+    @GetMapping(value = "refund/sku")
+    public ResponseDto<Boolean> refundOrderSku(@RequestParam(value = "orderId", required = true) @Valid String orderId,
+                                               @RequestParam(value = "orderSkuId", required = true) @Valid String orderSkuId,
+                                               @RequestParam(value = "price", required = true) @Valid BigDecimal price) {
+        return ResponseDto.success();
+    }
+
+    @ApiOperation(value = "整单退款")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderId", value = "订单id"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "BigDecimal", name = "price", value = "退款金额"),
+    })
+    @GetMapping(value = "refund")
+    public ResponseDto<Boolean> refundOrder(@RequestParam(value = "orderId", required = true) @Valid String orderId,
+                                            @RequestParam(value = "price", required = true) @Valid BigDecimal price) {
+        return ResponseDto.success();
+    }
+
+//    @ApiOperation(value = "发货")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderId", value = "订单id"),
+//            @ApiImplicitParam(type = "form", required = false, dataType = "BigDecimal", name = "price", value = "退款金额"),
+//    })
+//    @GetMapping(value = "refund")
+//    public ResponseDto<Boolean> express(@RequestParam(value = "orderId", required = true) @Valid String orderId,
+//        return ResponseDto.success();
+//    }
 }

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

@@ -79,14 +79,14 @@ public class GoblinZhengzaiController {
     }
 
     @PostMapping("config/insert")
-    @ApiOperation("活动详情-正在下单-配置商铺sku")
+    @ApiOperation("活动详情-正在下单-添加商铺sku")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<Boolean> zhengzaiStoreInsert(@RequestBody GoblinStoreZhengzaiCommonParam params) {
         return goblinZhengzaiService.zhengzaiSkuInsert(params);
     }
 
     @PostMapping("config/update")
-    @ApiOperation("活动详情-正在下单-配置商铺sku")
+    @ApiOperation("活动详情-正在下单-修改商铺sku")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<Boolean> zhengzaiStoreUpdate(@RequestBody GoblinStoreZhengzaiCommonParam params) {
         return goblinZhengzaiService.zhengzaiSkuUpdate(params);