修改 领券文案。

修改 订单详情拦截。

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

@@ -107,7 +107,8 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
     @Override
     public ResponseDto<GoblinAppOrderDetailsVo> orderDetails(String orderId, String uid) {
         GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(orderId);
-        if (!orderVo.getUserId().equals(uid) && uid != null) {
+
+        if (orderVo == null || (!orderVo.getUserId().equals(uid) && uid != null)) {
             return ResponseDto.failure(ErrorMapping.get("20003"));
         }
         GoblinAppOrderDetailsVo vo = GoblinAppOrderDetailsVo.getNew();

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

@@ -13,7 +13,7 @@
 140050=该活动优惠券不存在
 140051=非活动时间不允许领取
 140052=该活动优惠券为限量领取
-140053=该活动优惠券被抢关了
+140053=该活动优惠券被抢光了
 140054=该活动优惠券已被使用
 
 

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

@@ -675,7 +675,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             ResponseDto<GoblinPayInnerResultVo> dto = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<GoblinPayInnerResultVo>>() {
             });
             payInnerResultVo.setCode(dto.getData().getCode());
-            payInnerResultVo.setOrderCode(dto.getData().getOrderMasterCode());
+            payInnerResultVo.setOrderCode(storeOrderVo.getMasterOrderCode());
             payInnerResultVo.setPayData(dto.getData().getPayData());
             payInnerResultVo.setOrderId(storeOrderVo.getOrderId());
             payInnerResultVo.setPayType(param.getPayType());