修改 下单 bug 增加 临时券详情接口

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

@@ -12,17 +12,17 @@ import java.util.List;
 public class GoblinStoreBackOrderListVo implements Cloneable {
     @ApiModelProperty(value = "退款订单id")
     private String backOrderId;
-    @ApiModelProperty(value = "订单号")
+    @ApiModelProperty(value = "退款订单号")
     private String backCode;
-    @ApiModelProperty(value = "下单时间")
+    @ApiModelProperty(value = "订单号")
     private String orderCode;
-    @ApiModelProperty(value = "下单方式")
+    @ApiModelProperty(value = "类型[1-退款|2-退货]")
     private String type;
-    @ApiModelProperty(value = " 收货人姓名")
+    @ApiModelProperty(value = "退款／退货状态[0-商铺发起退款|1-退款申请(用户发送退款请求)|2-退款成功(商家同意退款)|3-退款拒绝(商家拒绝退款)|4-退货申请(用户发起退货请求)|5-退货拒绝(商家拒绝退货)|6-退货审核通过等待用户填写物流(商家审核通过，等待用户寄回商品)|7-待收货(用户已确认)|8-退货完成(商家收货并且同意退款给用户)|9-退货失败(商家不同意退款)")
     private String status;
-    @ApiModelProperty(value = " 收货人联系方式")
+    @ApiModelProperty(value = " 退款金额")
     private String realBackPrice;
-    @ApiModelProperty(value = " 收货人地址")
+    @ApiModelProperty(value = " 创建时间")
     private String createdAt;
     @ApiModelProperty(value = "退款sku")
     private List<GoblinBackOrderSkuVo> backOrderSkuVos;

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

@@ -2,10 +2,7 @@ package com.liquidnet.service.goblin.service.manage;
 
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreZhengzaiCommonParam;
-import com.liquidnet.service.goblin.dto.vo.ArDataVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinMarketSpuListVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinSelfZhengzaiSkuVo;
+import com.liquidnet.service.goblin.dto.vo.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
@@ -16,4 +13,6 @@ public interface IGoblinInnerService {
     ResponseDto<String> insertCoupon(MultipartFile file, String performanceId);
 
     ResponseDto<ArDataVo> getArData(String tag, String performanceId);
+
+    ResponseDto<TempCouponVo> getTempCouponData(String ucouponId);
 }

liquidnet-bus-config/liquidnet-config/liquidnet-service-goblin.yml

@@ -108,6 +108,7 @@ global-auth:
     - ${liquidnet.info.context}/order/pay/syncOrder
     - ${liquidnet.info.context}/store/coupon/backCoupon
     - ${liquidnet.info.context}/store/coupon/useCoupon
+    - ${liquidnet.info.context}/store/order/refundSyncOrder
   oncheck-url-pattern:
     -
 # -----------------------------------------------------------

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

@@ -2,10 +2,7 @@ package com.liquidnet.service.goblin.controller.Inner;
 
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreZhengzaiCommonParam;
-import com.liquidnet.service.goblin.dto.vo.ArDataVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinMarketSpuListVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinSelfZhengzaiSkuVo;
+import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.service.manage.IGoblinInnerService;
 import com.liquidnet.service.goblin.service.manage.IGoblinZhengzaiService;
 import io.swagger.annotations.*;
@@ -96,4 +93,14 @@ public class GoblinInnerZhengzaiController {
                                            @RequestParam("performanceId") String performanceId) {
         return goblinInnerService.getArData(tag, performanceId);
     }
+
+    @PostMapping("temp/coupon/data")
+    @ApiOperation("获取临时券数据")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", dataType = "String", name = "ucouponId", value = "券id", required = true),
+    })
+    public ResponseDto<TempCouponVo> getArData(@RequestParam("ucouponId") String ucouponId) {
+        return goblinInnerService.getTempCouponData(ucouponId);
+    }
 }

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

@@ -78,4 +78,10 @@ public class GoblinInnerServiceImpl implements IGoblinInnerService {
         vo.setGoodsInfoVos(goodsInfoVos);
         return ResponseDto.success(vo);
     }
+
+    @Override
+    public ResponseDto<TempCouponVo> getTempCouponData(String ucouponId) {
+        TempCouponVo tempCouponVo = redisUtils.getTempCoupon(ucouponId);
+        return ResponseDto.success(tempCouponVo);
+    }
 }

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

@@ -509,7 +509,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                 orderVo.getStatus(), now, orderId, now, now
         });
         queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
-                SqlMapping.gets(sqls, sqlsOrder, sqlsOrderSku));
+                SqlMapping.gets(sqls, sqlsOrder, sqlsOrderSku,sqlsMail));
         //添加日志
         queueUtils.sendMsgByRedis(
                 MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),

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

@@ -78,7 +78,7 @@ goblin_order.pay.again=UPDATE goblin_store_order SET pay_type = ? ,device_from =
 goblin_order.zhengzai.bind=UPDATE goblin_store_order SET user_id = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.zhengzai.push=UPDATE goblin_store_order SET zhengzai_status = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #----                   商铺订单操作
-goblin_order.store.cancel=UPDATE goblin_store_order SET mail_no = ? ,delivery_time = ? , logistics_company = ? , status = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+goblin_order.store.cancel=UPDATE goblin_store_order SET status = ? ,cancel_time = ? , cancel_reason = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.orderSkuStatus=UPDATE goblin_order_sku SET status = ? , updated_at = ? WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.express=UPDATE goblin_store_order SET status = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.mail=INSERT INTO goblin_mail (`mail_id`,`order_id`,`mail_no`,`delivery_time`,`logistics_company`,`order_sku_ids`,`created_at`) VALUES (?,?,?,?,?,?,?)
@@ -100,7 +100,7 @@ goblin_order.store.backOrderStatus=UPDATE goblin_back_order SET status = ? , aud
 goblin_order.store.orderStatus=UPDATE goblin_store_order SET status = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.applyRefund=UPDATE goblin_back_order SET status = ? ,reason=?,audit_at=?, updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #----                   用户订单操作
-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_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`,`mail_no`,`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 (?,?,?,?,?,?,?,?,?,?)