修复bug

.idea/encodings.xml

@@ -2,14 +2,24 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/module-base/base-api/jeecg-system-cloud-api/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-base/base-api/jeecg-system-cloud-api/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-base/base-api/jeecg-system-local-api/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-base/base-api/jeecg-system-local-api/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-base/base-api/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-base/base-api/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-base/base-core/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-base/base-core/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-base/base-tools/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-base/base-tools/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-base/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-base/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-common/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-common/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-pay/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-pay/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-system/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-system/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
 </project>

.idea/misc.xml

@@ -8,5 +8,5 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="ms-11" project-jdk-type="JavaSDK" />
 </project>

module-common/src/main/java/org/jeecg/api/controller/AppletAddressController.java

@@ -5,8 +5,11 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.api.bean.PageBean;
 import org.jeecg.api.service.AppletAddressService;
+import org.jeecg.api.service.AppletOrderService;
+import org.jeecg.api.service.impl.AppletOrderServiceImpl;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.commonAddress.entity.CommonAddress;
+import org.jeecg.modules.commonAddress.service.ICommonAddressService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -19,6 +22,10 @@ public class AppletAddressController {
 
     @Resource
     private AppletAddressService appletInfoService;
+    @Resource
+    private AppletOrderServiceImpl appletOrderService;
+    @Resource
+    private ICommonAddressService addressService;
 
 
     @ApiOperation(value="获取地址列表", notes="获取地址列表")
@@ -57,4 +64,15 @@ public class AppletAddressController {
     }
 
 
+    @ApiOperation(value="判断地址是否包邮", notes="判断地址是否包邮")
+    @GetMapping("/isAddress")
+    public Result<?> isAddress(String id){
+
+        CommonAddress byId = addressService.getById(id);
+
+        boolean b = appletOrderService.calculateFreeShipping(byId);
+
+        return Result.OK(b);
+    }
+
 }

module-common/src/main/java/org/jeecg/api/service/AppletAddressService.java

@@ -27,4 +27,5 @@ public interface AppletAddressService {
 
     //删除地址信息
     Result<?> deleteAddress(String token,String id);
+
 }

module-common/src/main/java/org/jeecg/api/service/impl/AppletAddressServiceImpl.java

@@ -89,4 +89,5 @@ public class AppletAddressServiceImpl implements AppletAddressService {
         commonAddressService.removeById(id);
         return Result.OK("删除成功");
     }
+
 }

module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java

@@ -600,7 +600,7 @@ public class AppletOrderServiceImpl implements AppletOrderService {
      * @param address 收货地址对象
      * @return true表示包邮，false表示不包邮
      */
-    private boolean calculateFreeShipping(CommonAddress address) {
+    public boolean calculateFreeShipping(CommonAddress address) {
         // 参数校验
         if (address == null || StringUtils.isBlank(address.getAddress())) {
             return false;

module-common/src/main/java/org/jeecg/modules/commonAddress/service/impl/CommonAddressServiceImpl.java

@@ -117,7 +117,7 @@ public class CommonAddressServiceImpl extends ServiceImpl<CommonAddressMapper, C
         for (CommonCity provinceNode : openCityList) {
             // 检查省份是否匹配且开通
             if (StringUtils.isNotBlank(provinceNode.getName()) && 
-                provinceNode.getName().equals(province) &&
+                provinceNode.getName().trim().equals(province.trim()) &&
                 "Y".equals(provinceNode.getOpen())) {
                 
                 // 级别1：只对比省份
@@ -133,7 +133,7 @@ public class CommonAddressServiceImpl extends ServiceImpl<CommonAddressMapper, C
                     for (CommonCity cityNode : provinceNode.getChildren()) {
                         // 检查城市是否匹配且开通
                         if (StringUtils.isNotBlank(cityNode.getName()) && 
-                            cityNode.getName().equals(city) &&
+                            cityNode.getName().trim().equals(city.trim()) &&
                             "Y".equals(cityNode.getOpen())) {
                             
                             // 级别2：只对比省市
@@ -149,7 +149,7 @@ public class CommonAddressServiceImpl extends ServiceImpl<CommonAddressMapper, C
                                 for (CommonCity districtNode : cityNode.getChildren()) {
                                     // 检查区县是否匹配且开通
                                     if (StringUtils.isNotBlank(districtNode.getName()) && 
-                                        districtNode.getName().equals(district) &&
+                                        districtNode.getName().trim().equals(district.trim()) &&
                                         "Y".equals(districtNode.getOpen())) {
                                         return true;
                                     }