bug fix

pom.xml

@@ -101,25 +101,6 @@
 			<artifactId>commons-collections</artifactId>
 			<version>3.2.1</version>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>1.4</version>
-		</dependency>
-		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.8.1</version>
-		</dependency>
-
-		<!-- https://mvnrepository.com/artifact/commons-lang/commons-lang -->
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.6</version>
-		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
 		<dependency>

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

@@ -7,12 +7,14 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.WxUtils;
+import com.huiju.estateagents.entity.TaMiniappQrcode;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.common.JWTUtils;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -169,4 +171,25 @@ public class MiniAppController {
     public ResponseBean qrcode(@RequestBody String paramsStr) {
         return miniAppService.getQrCode(paramsStr);
     }
+
+    /**
+     * 获取二维码参数
+     * @param serialNo
+     * @return
+     */
+    @GetMapping("/qrcode/scene/{serialNo}")
+    public ResponseBean getScene(@PathVariable String serialNo) {
+        try {
+            Integer id = Integer.valueOf(serialNo);
+            TaMiniappQrcode qrcode = miniAppService.getQrCodeBySerialNo(id);
+            if (null == qrcode) {
+                return ResponseBean.error("不存在的二维码参数", HttpStatus.SC_BAD_REQUEST);
+            }
+
+            return ResponseBean.success(qrcode.getQrParams());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error("获取二维码参数失败: " + e.getMessage(), HttpStatus.SC_INTERNAL_SERVER_ERROR);
+        }
+    }
 }

src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java

@@ -69,7 +69,7 @@ public class TaBuildingDynamicController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
-    public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId")Integer buildingId,
+    public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId")String buildingId,
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
                                                HttpServletRequest request){
@@ -86,7 +86,7 @@ public class TaBuildingDynamicController extends BaseController {
      */
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
-                                             @RequestParam("buildingId")Integer buildingId,
+                                             @RequestParam("buildingId")String buildingId,
                                              HttpServletRequest request){
         String openid = JWTUtils.getSubject(request);
         ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);

src/main/java/com/huiju/estateagents/controller/TaCheckinController.java

@@ -14,13 +14,7 @@ import com.huiju.estateagents.service.ITaPersonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
@@ -115,6 +109,19 @@ public class TaCheckinController extends BaseController {
         return responseBean;
     }
 
+    @GetMapping("/wx/taCheckin/activity/{activityId}/isChecked")
+    public ResponseBean isChecked(@PathVariable String activityId, HttpServletRequest request) {
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = iTaPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+
+        boolean checked = iTaCheckinService.isCustomerChecked(activityId, person.getPersonId()) > 0;
+        return ResponseBean.success(checked);
+    }
+
 //    /**
 //     * 根据id删除对象
 //     * @param id  实体ID

src/main/java/com/huiju/estateagents/controller/TaGoodsController.java

@@ -215,7 +215,7 @@ public class TaGoodsController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping(value="/wx/goods/exchange/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/wx/goods/exchange/{id}",method= RequestMethod.POST)
     public ResponseBean wxExchangeGoods(@PathVariable Integer id, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {

src/main/java/com/huiju/estateagents/controller/TaPointsExchangeController.java

@@ -156,13 +156,15 @@ public class TaPointsExchangeController extends BaseController {
     @RequestMapping(value="/wx/taPointsExchange",method= RequestMethod.GET)
     public ResponseBean wxPointsExchangeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                             @RequestParam("buildingId") Integer buildingId){
+                                             @RequestParam(value = "buildingId", required = false) String buildingId,
+                                             @RequestParam(value = "personId", required = false) String personId){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
             IPage<TaPointsExchange> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaPointsExchange> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("building_id",buildingId);
+            queryWrapper.eq(null != personId, "person_id", personId);
+            queryWrapper.eq(null != buildingId, "building_id",buildingId);
             queryWrapper.orderByDesc("create_date");
             
             IPage<TaPointsExchange> result = iTaPointsExchangeService.page(pg, queryWrapper);

src/main/java/com/huiju/estateagents/service/IMiniAppService.java

@@ -4,6 +4,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaMiniappQrcode;
 import me.chanjar.weixin.common.error.WxErrorException;
 
 import java.time.LocalDateTime;
@@ -24,4 +25,6 @@ public interface IMiniAppService {
     void sendNewCustomerMessage(String toUser, String link, String custName, String phone, String sex, String fromName);
 
     ResponseBean getQrCode(String paramsStr);
+
+    TaMiniappQrcode getQrCodeBySerialNo(Integer id);
 }

src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java

@@ -34,14 +34,14 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 微信小程序 项目动态管理列表
      * @return
      */
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId,String openid);
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid);
 
     /**
      * 微信小程序 项目详情
      * @param dynamicId
      * @return
      */
-    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId,String openid);
+    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,String buildingId,String openid);
 
     /**
      * 动态管理添加

src/main/java/com/huiju/estateagents/service/impl/ExtendContentServiceImpl.java

@@ -72,7 +72,7 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
         extendContentQuery.eq(StringUtils.isNotBlank(contentType), "content_type",contentType);
         extendContentQuery.eq(StringUtils.isNotBlank(buildingId), "building_id",buildingId);
         extendContentQuery.eq("status","1");
-        ExtendContent taExtendContent = extendContentMapper.selectOne(extendContentQuery);
+        List<ExtendContent> taExtendContent = extendContentMapper.selectList(extendContentQuery);
         responseBean.addSuccess(taExtendContent);
         return responseBean;
     }

src/main/java/com/huiju/estateagents/service/impl/MiniAppServiceImpl.java

@@ -130,17 +130,27 @@ public class MiniAppServiceImpl implements IMiniAppService {
         if (null == isHyaline) isHyaline = true;
 
         try {
-            File qrFile = wxService.getQrcodeService().createWxaCodeUnlimit(scene, page, width, autoColor, lineColor, isHyaline);
-            String qrcode = AliOSSUtils.putObject(qrFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
 
             TaMiniappQrcode taQrcode = new TaMiniappQrcode();
             taQrcode.setAppid(appid);
             taQrcode.setCreateDate(LocalDateTime.now());
             taQrcode.setExpireDate(LocalDateTime.now().plusDays(7));
-            taQrcode.setQrCode(qrcode);
             taQrcode.setQrParams(paramsStr);
 
-            taMiniappQrcodeMapper.insert(taQrcode);
+            boolean success = taMiniappQrcodeMapper.insert(taQrcode) > 0;
+            if (!success) {
+                return ResponseBean.error("生成二维码异常", ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+            // 使用ID作为场景值
+            String newScene = String.valueOf(taQrcode.getSerialNo());
+            System.out.println("==========生成二维码参数--->" + newScene);
+
+            File qrFile = wxService.getQrcodeService().createWxaCodeUnlimit(newScene, page, width, autoColor, lineColor, isHyaline);
+            String qrcode = AliOSSUtils.putObject(qrFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
+            taQrcode.setQrCode(qrcode);
+            taMiniappQrcodeMapper.updateById(taQrcode);
+
             return ResponseBean.success(qrcode);
         } catch (Exception e) {
             e.printStackTrace();
@@ -148,6 +158,11 @@ public class MiniAppServiceImpl implements IMiniAppService {
         }
     }
 
+    @Override
+    public TaMiniappQrcode getQrCodeBySerialNo(Integer id) {
+        return taMiniappQrcodeMapper.selectById(id);
+    }
+
     private void sendMessage(String tplName, String toUser, String link, List<WxMaTemplateData> data) {
         WxProperties.Tpl tpl = WxUtils.getTplByName(tplName);
         if (null == tpl) return ;

src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java

@@ -86,7 +86,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId,String openid) {
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
@@ -120,7 +120,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId,String openid) {
+    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,String buildingId,String openid) {
 
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -538,23 +538,25 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
     public void addConsultantBuildings(String personId, String paramStr) {
         JSONObject params = JSONObject.parseObject(paramStr);
-        JSONArray buildings = params.getJSONArray("buildings");
+        String building = params.getString("buildings");
+//        JSONArray buildings = params.getJSONArray("buildings");
 
-        if (null != buildings && !buildings.isEmpty()) {
+//        if (null != buildings && !buildings.isEmpty()) {
             // 先删除原来授权楼栋
             QueryWrapper<TaPersonBuilding> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("person_id", personId);
             taPersonBuildingMapper.delete(queryWrapper);
 
             // 再插入新的授权
-            for (Object b : buildings) {
+//            for (Object b : buildings) {
                 TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
-                taPersonBuilding.setBuildingId(b.toString());
+//                taPersonBuilding.setBuildingId(b.toString());
+                taPersonBuilding.setBuildingId(building);
                 taPersonBuilding.setPersonId(personId);
                 taPersonBuilding.setCreateDate(LocalDateTime.now());
                 taPersonBuildingMapper.insert(taPersonBuilding);
-            }
-        }
+//            }
+//        }
     }
 
     @Override

src/main/resources/mapper/TaCheckinMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huiju.estateagents.entity.TaCheckin">
+<mapper namespace="com.huiju.estateagents.mapper.TaCheckinMapper">
     <select id="getUndisplayedCustomerList" resultType="com.huiju.estateagents.entity.TaCheckin">
         SELECT
         *