增加 店铺名称字段

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

@@ -45,6 +45,8 @@ public class GoblinMixAppDetailsVo implements Serializable, Cloneable {
     private Integer status;
     @ApiModelProperty(position = 24, value = "IOS支付方式[0-第三方支付|1-苹果支付]")
     private Integer payType;
+    @ApiModelProperty(position = 25, value = "店铺名称]")
+    private String storeName;
 
     private static final GoblinMixAppDetailsVo obj = new GoblinMixAppDetailsVo();
 
@@ -56,7 +58,7 @@ public class GoblinMixAppDetailsVo implements Serializable, Cloneable {
         }
     }
 
-    public GoblinMixAppDetailsVo copy(GoblinMixDetailsVo source) {
+    public GoblinMixAppDetailsVo copy(GoblinMixDetailsVo source,String storeName) {
         if (null == source) return this;
         this.setMixId(source.getMixId());
         this.setName(source.getName());
@@ -73,6 +75,7 @@ public class GoblinMixAppDetailsVo implements Serializable, Cloneable {
         this.setWhiteType(source.getWhiteType());
         this.setItem(source.getItem());
         this.setPayType(source.getPayType());
+        this.setStoreName(storeName);
         return this;
     }
 }

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

@@ -16,10 +16,6 @@ public interface IMixOrderService {
 
     String syncOrder(SyncOrderParam syncOrderParam);
 
-//    String refundSyncOrder(RefundCallbackParam refundCallbackParam);
-
-    ResponseDto<Integer> checkOrderResult(String orderId);
-
     ResponseDto<Integer> checkOrderResultMaterCode(String materCode);
 
 

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

@@ -78,7 +78,8 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
     @Override
     public ResponseDto<GoblinMixAppDetailsVo> mixDetails(String mixId) {
         GoblinMixDetailsVo baseVo = redisUtils.getMixDetails(mixId);
-        GoblinMixAppDetailsVo vo = GoblinMixAppDetailsVo.getNew().copy(baseVo);
+        GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVo(baseVo.getStoreId());
+        GoblinMixAppDetailsVo vo = GoblinMixAppDetailsVo.getNew().copy(baseVo, storeInfoVo.getStoreName());
         int stock = 0;
         for (GoblinMixDetailsItemVo item : vo.getItem()) {
             GoblinGoodsSkuInfoVo skuInfoVo = redisUtils.getGoodsSkuInfoVo(item.getSkuId());

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

@@ -982,6 +982,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     orderSkuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_6.getValue());
                     String pre = GoblinStatusConst.MarketPreStatus.getPre(orderSkuVo.getSkuId());
                     String skuId = orderSkuVo.getSkuId();
+                    //需要判断是否超时支付
                     redisUtils.incrSkuStock(pre, skuId, orderSkuVo.getNum());
                     redisUtils.decrSkuCountByUid(orderVo.getUserId(), skuId, orderSkuVo.getNum());
                 }

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

@@ -527,10 +527,6 @@ public class MixOrderServiceImpl implements IMixOrderService {
         return null;
     }
 
-    @Override
-    public ResponseDto<Integer> checkOrderResult(String orderId) {
-        return null;
-    }
 
     @Override
     public ResponseDto<Integer> checkOrderResultMaterCode(String materCode) {