Merge branch 'master' of wangchaoqun/kmall-haikong into master

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

@@ -3,14 +3,11 @@ package com.kmall.admin.haikong.client;
 import cn.hutool.core.map.MapUtil;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.kmall.admin.haikong.config.HaiKongProperties;
-import com.kmall.admin.haikong.constant.Constants;
-import com.kmall.admin.haikong.dto.AccessTokenDTO;
+import com.kmall.admin.haikong.constant.HaiKongMemberSystemUrlEnum;
 import com.kmall.admin.haikong.dto.MemberInfoDTO;
 import com.kmall.admin.haikong.task.MemberSysAccessTokenRefreshTask;
 import com.kmall.admin.haikong.utils.*;
-import com.kmall.admin.haikong.constant.HaiKongMemberSystemUrlEnum;
 import com.kmall.admin.utils.jackson.JacksonUtil;
-import com.kmall.manager.manager.redis.JedisUtil;
 import okhttp3.MediaType;
 import okhttp3.Request;
 import okhttp3.RequestBody;
@@ -23,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
-import java.math.BigDecimal;
 import java.util.Map;
 
 
@@ -104,9 +100,9 @@ public class HaiKongMemberTemplate {
         String url = haiKongProperties.getMemberUrl() + HaiKongMemberSystemUrlEnum.QUERY_ACCESS_TOKEN.getUrl() + "?app_id=" + haiKongProperties.getMemberAppId() + "&timestamp=" + System.currentTimeMillis();
         url = getSignUrl(url, "");
         Request request = new Request.Builder()
+                            .post(requestBody(""))
                             .url(url)
                             .build();
-
         String response = OkHttpUtils.retry(request, haiKongProperties.getRetry());
         log.info("请求获取accessToken接口成功......" + response);
         return response;
@@ -122,6 +118,7 @@ public class HaiKongMemberTemplate {
         String url = haiKongProperties.getMemberUrl() + HaiKongMemberSystemUrlEnum.REFRESH_ACCESS_TOKEN.getUrl() + "?refresh_token=" + refreshToken + "&timestamp=" + System.currentTimeMillis();
         url = getSignUrl(url, "");
         Request request = new Request.Builder()
+                            .post(requestBody(""))
                             .url(url)
                             .build();
         String response = OkHttpUtils.retry(request, haiKongProperties.getRetry());

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -4143,7 +4143,7 @@ public class OrderServiceImpl implements OrderService {
                 // 计算综合税率
                 BigDecimal taxRate = tax.divide(pretaxPrice, 4, RoundingMode.HALF_UP);
                 // 消费税率
-                BigDecimal saleTaxRate = new BigDecimal(taxDetailDto.getSaleTaxRate()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
+                BigDecimal saleTaxRate = new BigDecimal(Objects.isNull(taxDetailDto.getSaleTaxRate()) ? "0" : taxDetailDto.getSaleTaxRate() ).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
                 // 综合税率
                 BigDecimal vatRate = new BigDecimal(taxDetailDto.getVatRate()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
 //              消费税 = （明细商品总价 / (1-消费税税率)） * 消费税税率