添加日志、注释

kmall-admin/src/main/java/com/kmall/admin/entity/OrderEntity.java

@@ -69,9 +69,9 @@ public class OrderEntity implements Serializable {
     private BigDecimal shippingFee;
     //实际需要支付的金额
     private BigDecimal actualPrice;
-    //
+    // 积分
     private Integer integral;
-    //
+    // 积分抵扣金额
     private BigDecimal integralMoney;
     //订单总价
     private BigDecimal orderPrice;

kmall-admin/src/main/java/com/kmall/admin/haikong/HaiKongMemberTemplate.java

@@ -6,6 +6,8 @@ import com.kmall.common.constant.HaiKongMemberSystemUrlEnum;
 import okhttp3.MediaType;
 import okhttp3.Request;
 import okhttp3.RequestBody;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -18,6 +20,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class HaiKongMemberTemplate {
 
+    private static final Logger log = LoggerFactory.getLogger(HaiKongMemberTemplate.class);
+
     @Autowired
     private HaiKongProperties haiKongProperties;
 
@@ -35,7 +39,7 @@ public class HaiKongMemberTemplate {
     private String appendQueryParam(String url, String accessToken, String sign) {
         return url + "?" + "access_token=" + accessToken +
                 "&" + "sign=" + sign +
-                "&" + "timestamp=" + String.valueOf(System.currentTimeMillis());
+                "&" + "timestamp=" + System.currentTimeMillis();
     }
 
     /**
@@ -43,11 +47,15 @@ public class HaiKongMemberTemplate {
      * @return  accessToken
      */
     public String getAccessToken() {
+        log.info("请求获取accessToken......");
         String url = HaiKongMemberSystemUrlEnum.QUERY_ACCESS_TOKEN.getUrl();
         Request request = new Request.Builder()
                             .url(haiKongProperties.getMemberUrl() + url)
                             .build();
-        return OkHttpUtils.retry(request, haiKongProperties.getRetry());
+
+        String response = OkHttpUtils.retry(request, haiKongProperties.getRetry());
+        log.info("请求获取accessToken成功......");
+        return response;
     }
 
     /**
@@ -55,11 +63,14 @@ public class HaiKongMemberTemplate {
      * @return  accessToken
      */
     public String refreshAccessToken() {
+        log.info("请求刷新accessToken......");
         String url = HaiKongMemberSystemUrlEnum.REFRESH_ACCESS_TOKEN.getUrl();
         Request request = new Request.Builder()
                             .url(haiKongProperties.getMemberUrl() + url)
                             .build();
-        return OkHttpUtils.retry(request, haiKongProperties.getRetry());
+        String response = OkHttpUtils.retry(request, haiKongProperties.getRetry());
+        log.info("请求刷新accessToken成功......");
+        return response;
     }
 
     /**
@@ -69,39 +80,48 @@ public class HaiKongMemberTemplate {
      * @return  会员信息
      */
     public String getMemberInfoByPhone(String body) {
+        log.info("请求根据手机号获取会员信息......");
         Request request = new Request.Builder()
                             .post(requestBody(body))
                             .url(haiKongProperties.getMemberUrl() + appendQueryParam(HaiKongMemberSystemUrlEnum.QUERY_MEMBER_INFO_BY_PHONE.getUrl(), "", ""))
                             .build();
-        return OkHttpUtils.retry(request, haiKongProperties.getRetry());
+        String response = OkHttpUtils.retry(request, haiKongProperties.getRetry());
+        log.info("请求根据手机号获取会员信息成功......");
+        return response;
     }
 
     /**
-     * 根据手机号获取会员信息
+     * 根据会员码获取会员信息
      * 可根据会员码或手机号或会员的open_id来获取会员信息
      * @param body 请求体
      * @return  会员信息
      */
     public String getMemberInfoByCode(String body) {
+        log.info("请求根据会员码获取会员信息......");
         Request request = new Request.Builder()
                             .post(requestBody(body))
                             .url(haiKongProperties.getMemberUrl() + appendQueryParam(HaiKongMemberSystemUrlEnum.QUERY_MEMBER_INFO_BY_CODE.getUrl(), "", ""))
                             .build();
-        return OkHttpUtils.retry(request, haiKongProperties.getRetry());
+        String response = OkHttpUtils.retry(request, haiKongProperties.getRetry());
+        log.info("请求根据会员码获取会员信息成功......");
+        return response;
     }
 
     /**
      * 获取会员优惠券详细信息
-     * 待定
+     * TODO 待定
      * @param body 请求体
      * @return  优惠券信息
      */
     public String getMemberCouponInfo(String body) {
+        log.info("请求获取会员优惠券详细信息......");
         Request request = new Request.Builder()
                             .get()
                             .url(haiKongProperties.getMemberUrl() + appendQueryParam(HaiKongMemberSystemUrlEnum.QUERY_MEMBER_COUPON.getUrl(), "", ""))
                             .build();
-        return OkHttpUtils.retry(request, haiKongProperties.getRetry());
+        String response = OkHttpUtils.retry(request, haiKongProperties.getRetry());
+        log.info("请求获取会员优惠券详细信息成功......");
+        return response;
     }
 
     /**
@@ -110,11 +130,14 @@ public class HaiKongMemberTemplate {
      * @return      响应数据
      */
     public String changeMemberScore(String body) {
+        log.info("请求会员积分变动接口......");
         Request request = new Request.Builder()
                             .post(requestBody(body))
                             .url(haiKongProperties.getMemberUrl() + appendQueryParam(HaiKongMemberSystemUrlEnum.CHANGE_MEMBER_SCORE.getUrl(), "", ""))
                             .build();
-        return OkHttpUtils.retry(request, haiKongProperties.getRetry());
+        String response = OkHttpUtils.retry(request, haiKongProperties.getRetry());
+        log.info("请求会员积分变动接口成功......");
+        return response;
     }
 
 }

kmall-admin/src/main/java/com/kmall/admin/utils/haikong/OkHttpUtils.java

@@ -60,6 +60,13 @@ public class OkHttpUtils {
             try {
                 String response = okHttpClientSSL.newCall(request).execute().body().string();
                 count.set(99);
+                logger.info("调用接口成功！\n==========================================================\n url：{} \n header：{} \n body：{} \n retry：{}" +
+                                "\n=========================================================="
+                        , request.url().toString()
+                        , JacksonUtil.toJson(request.headers())
+                        , JacksonUtil.toJson(Objects.isNull(request.body()) ? "" : request.body().contentType())
+                        , count.get()
+                );
                 return response;
             } catch (IOException e) {
                 logger.error("调用接口失败！重试中......\n==========================================================\n url：{} \n header：{} \n body：{} \n retry：{}" +