优化格式

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-sqb/src/main/java/com/liquidnet/common/third/sqb/biz/SqbBiz.java

@@ -3,13 +3,13 @@ package com.liquidnet.common.third.sqb.biz;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.commons.lang.util.MD5Utils;
 import com.liquidnet.common.third.sqb.config.SqbConfig;
 import com.liquidnet.common.third.sqb.param.callback.CallbackParams;
 import com.liquidnet.common.third.sqb.param.request.*;
 import com.liquidnet.common.third.sqb.param.response.*;
 import com.liquidnet.common.third.sqb.param.response.data.*;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.commons.lang.util.MD5Utils;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpEntity;
@@ -79,8 +79,10 @@ public class SqbBiz {
     public SettlementCreateData createSettlement(SettlementCreateRequest request) {
         return executeShouQianBaRequest("/optimus/core/order/createCheckoutItems", "创建结算明细", request, SettlementCreateResponse.class);
     }
+
     /**
      * 创建结算明细
+     *
      * @param mallSn        商城ID
      * @param signature     商城密钥
      * @param userId        正在用户ID
@@ -103,8 +105,10 @@ public class SqbBiz {
     public OrderCreateData createOrder(OrderCreateRequest request) {
         return executeShouQianBaRequest("/optimus/core/order/placeOrder", "创建订单", request, OrderCreateResponse.class);
     }
+
     /**
      * 创建订单
+     *
      * @param mallSn          商城ID
      * @param signature       商城密钥
      * @param checkoutItemsId 创建结算明细 返回的 结算项ID
@@ -138,8 +142,10 @@ public class SqbBiz {
     public CashierQueryData queryCashier(CashierQueryRequest request) {
         return executeShouQianBaRequest("/optimus/core/cashier/queryCashierPage", "查询收银台", request, CashierQueryResponse.class);
     }
+
     /**
      * 查询收银台
+     *
      * @param acquiringSn        收单号
      * @param acquiringSignature 收单密钥
      * @param userId             正在用户ID
@@ -166,8 +172,10 @@ public class SqbBiz {
     public CreateWechatPrepayOrderData createWechatPrepayOrder(CreateWechatPrepayOrderRequest request) {
         return executeShouQianBaRequest("/optimus/core/cashier/proxyPreCreatedPay", "创建微信预支付订单", request, CreateWechatPrepayOrderResponse.class);
     }
+
     /**
      * 创建微信预支付订单
+     *
      * @param acquiringSn       收单号
      * @param signature         收单签名
      * @param userId            正在用户ID
@@ -206,8 +214,10 @@ public class SqbBiz {
     public CouponQueryData queryCoupon(CouponQueryRequest request) {
         return executeShouQianBaRequest("/optimus/core/voucher/queryOrderVoucherList", "查询优惠券", request, CouponQueryResponse.class);
     }
+
     /**
      * 查询券码
+     *
      * @param sn        订单ID
      * @param signature 订单密码
      * @return
@@ -227,8 +237,10 @@ public class SqbBiz {
         CouponStatusSyncResponse response = executeRequestAndGetResponse("/optimus/core/voucher/modifyOrderVoucherList", "同步优惠券状态", request, CouponStatusSyncResponse.class);
         return response != null && Boolean.TRUE.equals(response.getSuccess());
     }
+
     /**
      * 券码状态同步
+     *
      * @param redeemMerchantId      用户ID（自定义，核销用户id）
      * @param voucherNos            券号
      * @param redeemExternalOrderSn 外部单号（${AppCode}+id，AppCode需要分配）
@@ -254,6 +266,7 @@ public class SqbBiz {
     public CouponRefundData refundCoupon(CouponRefundRequest request) {
         return executeShouQianBaRequest("/optimus/core/aftersale/applyRefund", "退款优惠券", request, CouponRefundResponse.class);
     }
+
     /**
      * @param sn           单号（前置操作后拿到）
      * @param signature    密码（前置操作后拿到）
@@ -287,8 +300,10 @@ public class SqbBiz {
     public List<MallListQueryData> queryMallList(MallListQueryRequest request) {
         return executeShouQianBaRequest("/optimus/core/open/mall/queryMallList", "查询门店列表", request, MallListQueryResponse.class);
     }
+
     /**
      * 商城列表接口
+     *
      * @param endCursor 结束游标 上一页的结束游标（首次查询传 null）
      * @param count     查询数量 每页返回的最大订单数
      * @return
@@ -320,8 +335,10 @@ public class SqbBiz {
     public List<MallProductsQueryData> queryMallProducts(MallProductsQueryRequest request) {
         return executeShouQianBaRequest("/optimus/core/open/mall/queryMallProducts", "查询门店商品", request, MallProductsQueryResponse.class);
     }
+
     /**
      * 商城商品接口
+     *
      * @param mallSn    商城ID
      * @param signature 商城密码
      * @return

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-sqb/src/main/java/com/liquidnet/common/third/sqb/param/response/data/MallProductsQueryData.java

 package com.liquidnet.common.third.sqb.param.response.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.List;
+
 /**
  * 商城商品接口响应数据
  */
@@ -14,45 +13,68 @@ import java.util.List;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class MallProductsQueryData {
 
-    /** 商品spuId */
+    /**
+     * 商品spuId
+     */
     private String spuId;
 
-    /** 商品图片 */
+    /**
+     * 商品图片
+     */
     private List<String> converImages;
 
-    /** 商品描述 */
+    /**
+     * 商品描述
+     */
     private String productIntroduction;
 
-    /** 商品标题 */
+    /**
+     * 商品标题
+     */
     private String title;
 
-    /** 商品规格 */
+    /**
+     * 商品规格
+     */
     private List<Sku> skuResults;
 
 
-    @Data
-    @JsonIgnoreProperties(ignoreUnknown = true)
     /**
      * 商品规格
      */
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+
     public static class Sku {
 
-        /** 库存类型 */
+        /**
+         * 库存类型
+         */
         private Integer stockType;
 
-        /** 商品skuId */
+        /**
+         * 商品skuId
+         */
         private String skuId;
 
-        /** 库存值 */
+        /**
+         * 库存值
+         */
         private BigDecimal quantity;
 
-        /** 规格标题 */
+        /**
+         * 规格标题
+         */
         private String skuTitle;
 
-        /** 规格名称 */
+        /**
+         * 规格名称
+         */
         private String skuName;
 
-        /** 价格 */
+        /**
+         * 价格
+         */
         private Long price;
     }
 }

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

@@ -1133,7 +1133,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         respVo.setCount(total);
         int start = safePage * safePageSize;
         if (start >= total) {
-            respVo.setGoblinGoodsInfoVoList(ObjectUtil.goblinGoodsInfoVoArrayList());
+            respVo.setGoblinGoodsInfoVoList(allGoods);
             return respVo;
         }
         int end = Math.min(start + safePageSize, total);