发起退款 增加 物流公司，物流单号

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

@@ -21,4 +21,9 @@ public class GoblinAppOrderRefundParam {
     private Integer refundType;
     @ApiModelProperty(value = "退款orderSkuId[不传为整单退款]")
     private String orderSkuId;
+
+    @ApiModelProperty(value = "物流公司")
+    private String company;
+    @ApiModelProperty(value = "快递单号")
+    private String mailNo;
 }

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

@@ -14,5 +14,5 @@ public interface GoblinCouponService {
     ArrayList<GoblinStoreCouponVo> getSpuByType(String spuId, String storeId, String type);
 
     //领取券
-    ArrayList<Boolean> receiveCoupon(String storeCouponId, Integer number);
+    Boolean receiveCoupon(String storeCouponId, Integer number);
 }

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

+package com.liquidnet.service.goblin.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreCouponVo;
+import com.liquidnet.service.goblin.service.GoblinCouponService;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+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.ArrayList;
+
+@Slf4j
+@Api(tags = "正在下单相关-商铺")
+@RestController
+@RequestMapping("/store/coupon")
+public class GoblinCouponController {
+
+    @Autowired
+    GoblinCouponService goblinCouponService;
+
+    @PostMapping("type")
+    @ApiOperation("商品可参与券类型")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "spuId", value = "spuId"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺id"),
+    })
+    public ResponseDto<ArrayList<String>> getSpuType(@RequestParam("spuId") @Valid String spuId,
+                                                     @RequestParam("storeId") @Valid String storeId) {
+        return ResponseDto.success(goblinCouponService.getSpuType(spuId, storeId));
+    }
+
+    @PostMapping("type/list")
+    @ApiOperation("券列表[根据类型]")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "spuId", value = "spuId"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺id"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "券类型[1-代金券|2-折扣券|3-满减券]"),
+    })
+    public ResponseDto<ArrayList<GoblinStoreCouponVo>> checkOrderResult(@RequestParam("spuId") @Valid String spuId,
+                                                                        @RequestParam("storeId") @Valid String storeId,
+                                                                        @RequestParam("type") @Valid String type) {
+        return ResponseDto.success(goblinCouponService.getSpuByType(spuId, storeId, type));
+    }
+
+    @PostMapping("checkPayment")
+    @ApiOperation("订单状态")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeCouponId", value = "平台券id"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "number", value = "数量"),
+    })
+    public ResponseDto<Boolean> checkOrderResult(@RequestParam("storeCouponId") @Valid String storeCouponId,
+                                                 @RequestParam("number") @Valid Integer number) {
+        return ResponseDto.success(goblinCouponService.receiveCoupon(storeCouponId, number));
+    }
+}

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

@@ -51,7 +51,7 @@ public class GoblinCouponImpl implements GoblinCouponService {
     }
 
     @Override
-    public ArrayList<Boolean> receiveCoupon(String storeCouponId, Integer number) {
+    public Boolean receiveCoupon(String storeCouponId, Integer number) {
         return null;
     }
 }

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

@@ -165,6 +165,8 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
         backOrder.setOrderId(param.getOrderId());
         backOrder.setOrderCode(orderVo.getOrderCode());
         backOrder.setStoreId(orderVo.getStoreId());
+        backOrder.setLogisCompanyName(param.getCompany());
+        backOrder.setMailNo(param.getMailNo());
         backOrder.setUserId(orderVo.getUserId());
         backOrder.setType(GoblinStatusConst.Type.BACK_TYPE_1.getValue());
         backOrder.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_1.getValue());
@@ -265,7 +267,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
                 backOrder.getOrderCode(), backOrder.getStoreId(), backOrder.getUserId(),
                 backOrder.getSkuIdNums(), backOrder.getType(), backOrder.getReason(),
                 backOrder.getDescribes(), backOrder.getRealBackPrice(), backOrder.getBackPriceExpress(), backOrder.getStatus(),
-                backOrder.getCreatedAt()
+                backOrder.getLogisCompanyName(), backOrder.getMailNo(), backOrder.getCreatedAt()
         });
         //添加日志
         refundLog.add(new Object[]{

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

@@ -102,7 +102,7 @@ goblin_order.store.applyRefund=UPDATE goblin_back_order SET status = ? ,reason=?
 
 
 #----                   用户订单操作
-goblin_order.user.applyRefund=INSERT INTO goblin_back_order (`back_order_id`,`back_code`,`order_id`,`order_code`,`store_id`,`user_id`,`sku_id_nums`,`type`,`reason`,`describes`,`real_back_price`,`back_price_express`,`status`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+goblin_order.user.applyRefund=INSERT INTO goblin_back_order (`back_order_id`,`back_code`,`order_id`,`order_code`,`store_id`,`user_id`,`sku_id_nums`,`type`,`reason`,`describes`,`real_back_price`,`back_price_express`,`status`,`logis_company_name`,`mailNo`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 #----  购物车操作
 goblin_shop.cart.delete = UPDATE goblin_shopping_cart set del_tag=? where  user_id=? and sku_id=?
 goblin_shop.cart.insert = insert into goblin_shopping_cart (car_id, user_id, store_id,spu_id, sku_id, `number`,marketing_id, del_tag, `comment`,`type`) values (?,?,?,?,?,?,?,?,?,?)