合并

whole-estate/src/main/java/com/example/wholeestate/controller/WxUserController.java

@@ -32,6 +32,15 @@ public class WxUserController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/wx/user", method = RequestMethod.PUT)
+    @ApiOperation(value = "更新用户", notes = "更新用户")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "customerId 用户ID;customerName用户姓名;name昵称;phone手机号;idNum证件号码;openid标记;uuid标记;avatar头像;")
+    })
+    public ResponseBean updateCustomer(@RequestBody String parameter) {
+        return iCustomerService.updateCustomer(parameter);
+    }
+
     @RequestMapping(value = "/wx/info/{openid}", method = RequestMethod.GET)
     @ApiOperation(value = "获取微信小程序用户信息", notes = "获取微信小程序用户信息")
     @ApiImplicitParams({

whole-estate/src/main/java/com/example/wholeestate/service/ICustomerService.java

@@ -50,4 +50,6 @@ public interface ICustomerService extends IService<Customer> {
      */
     ResponseBean wxOpenid(String code);
 
+
+    ResponseBean updateCustomer(String parameter);
 }

whole-estate/src/main/java/com/example/wholeestate/service/impl/BuildingServiceImpl.java

@@ -389,6 +389,15 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         QueryWrapper<Building> buildingQueryWrapper = new QueryWrapper<>();
         buildingQueryWrapper.eq("status", 1);
         List<Building> buildingList = buildingMapper.selectList(buildingQueryWrapper);
+
+        for (Building build:buildingList) {
+            QueryWrapper<BuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
+            BuildingImgQueryWrapper.eq("building_id", build.getBuildingId());
+            BuildingImgQueryWrapper.eq("img_type", "banner");
+            List<BuildingImg> buildingImg = buildingImgMapper.selectList(BuildingImgQueryWrapper);
+            build.setBuildingImg(buildingImg);
+        }
+
         responseBean.addSuccess(buildingList);
 
         return responseBean;

whole-estate/src/main/java/com/example/wholeestate/service/impl/CustomerServiceImpl.java

@@ -2,6 +2,7 @@ package com.example.wholeestate.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,11 +11,11 @@ import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.common.uuid.IdGen;
 import com.example.wholeestate.dao.CustomerMapper;
 
-import com.example.wholeestate.model.Building;
 import com.example.wholeestate.model.Customer;
 import com.example.wholeestate.service.ICustomerService;
 import com.example.wholeestate.utils.BeanTools;
 import com.example.wholeestate.wx.mini.IWxMini;
+import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -134,4 +135,25 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         responseBean.addSuccess(customer);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean updateCustomer(String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        Customer customer = JSONObject.parseObject(parameter, Customer.class);
+
+        UpdateWrapper<Customer> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("customerName", customer.getCustomerName());
+        updateWrapper.set("name", customer.getName());
+        updateWrapper.set("phone", customer.getPhone());
+        updateWrapper.set("idNum", customer.getIdNum());
+        updateWrapper.set("remark", customer.getRemark());
+        updateWrapper.eq("customer_id", customer.getCustomerId());
+
+        int success = customerMapper.update(customer, updateWrapper);
+        if (success >= 0) {
+            responseBean.addError(HttpStatus.SC_INTERNAL_SERVER_ERROR, "更新用户信息失败");
+        }
+
+        return responseBean;
+    }
 }