修复显示，增加排序

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -76,6 +76,9 @@ public class ShiroConfig {
 
         filterChainDefinitionMap.put("/alUser/**", "anon");
         filterChainDefinitionMap.put("/index/**", "anon");
+        filterChainDefinitionMap.put("/address/confAddressList", "anon");
+        filterChainDefinitionMap.put("/product/productList", "anon");
+        filterChainDefinitionMap.put("/product/productlist", "anon");
 
         filterChainDefinitionMap.put("/sys/oss/file/upload", "anon"); //图片上传验证放开
         filterChainDefinitionMap.put("/sys/common/upload", "anon"); //图片上传验证放开

jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/IndexController.java

@@ -88,6 +88,14 @@ public class IndexController {
         return indexInfo;
     }
 
+    @ApiOperation(value = "平台客户电话等信息")
+    @RequestMapping(value = "/getIndex", method = RequestMethod.POST)
+    public Result getIndex() {
+        Result<?> indexInfo = indexService.getIndex();
+        return indexInfo;
+    }
+
+
 
     @ApiOperation(value = "获取banner列表")
     @RequestMapping(value = "/bannerList", method = RequestMethod.POST)

jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java

@@ -175,11 +175,26 @@ public class ProductController extends JeecgController<TbProduct, ProductService
         TbCustoms tbCustoms = new TbCustoms();
         BeanUtils.copyProperties(customsReq, tbCustoms);
         tbCustoms.setUserId(hanHaiMember.getId());
-        tbCustomsService.save(tbCustoms);
+        tbCustoms.setId(customsReq.getId());
+        tbCustoms.setAuditStatus(0);
+        tbCustomsService.saveOrUpdate(tbCustoms);
         return Result.OK("添加成功！");
     }
 
 
+    @ApiOperation(value = "我的清关申请", notes = "我的清关申请")
+    @PostMapping(value = "/myCustoms")
+    public Result<TbCustoms> myCustoms(@RequestHeader("X-Access-Token") String token) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        QueryWrapper<TbCustoms> wrapper = new QueryWrapper<>();
+        wrapper.eq("user_id",hanHaiMember.getId()).orderByDesc("create_time").last("limit 1");
+        TbCustoms one = tbCustomsService.getOne(wrapper);
+        return Result.OK(one);
+    }
+
+
+
+
     @ApiOperation(value = "下订单", notes = "订单")
     @PostMapping(value = "/addProductOrder")
     public Result<String> addProductOrder(@RequestBody ProductOrderReq productOrderReq, @RequestHeader("X-Access-Token") String token) {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/IndexService.java

@@ -12,6 +12,9 @@ public interface IndexService {
     //获取首页基础信息
     Result<?> getIndexInfo(String token);
 
+    Result<?> getIndex();
+
+
     Result<?> getSysText(String token);
 
     Result<Map<Integer, List<WebBanner>>> bannerList();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/impl/IndexServiceImpl.java

@@ -74,6 +74,21 @@ public class IndexServiceImpl implements IndexService {
         return Result.OK(jsonObject);
     }
 
+    @Override
+    public Result<?> getIndex() {
+        JSONObject jsonObject = new JSONObject();
+        QueryWrapper<TbConf> objectQueryWrapper = new QueryWrapper<>();
+        objectQueryWrapper.eq("name", "sys_phone");
+        TbConf one = tbConfService.getOne(objectQueryWrapper);
+        //平台客户电话号码
+        jsonObject.put("phone", ValidateTool.isNull(one) ? "19198239116" : one.getValue());
+        //清关背景图
+        QueryWrapper<TbConf> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("name", "sys_pic_qg");
+        TbConf pic = tbConfService.getOne(queryWrapper);
+        jsonObject.put("pic", ValidateTool.isNull(pic) ? "https://dianpin-img.xzaiyp.top/temp/组478612x_1730704228537.png" : pic.getValue());
+        return Result.OK(jsonObject);
+    }
 
     @Override
     public Result<Map<Integer, List<WebBanner>>> bannerList() {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java

@@ -81,10 +81,10 @@ public class ProductServiceImpl extends ServiceImpl<TbProductMapper, TbProduct>
         product.setUserId(hanHaiMember.getId());
         product.setCompanyName(one1.getCompanyName());
         product.setAuditStatus(0);
-        product.setAddress(byId.getAddress() + byId.getAddressDetail());
+        product.setAddress(byId.getAddress());
         product.setShowStatus(2);
         //默认图片
-        product.setProductType(2);
+        product.setProductType(productReq.getProductType());
         product.setSpecsName(specs.getSpecsName());
         tbProductMapper.insert(product);
         return Result.OK("添加成功！");