张延森 пре 5 година
родитељ
комит
7ee16298db

+ 0
- 19
pom.xml Прегледај датотеку

@@ -101,25 +101,6 @@
101 101
 			<artifactId>commons-collections</artifactId>
102 102
 			<version>3.2.1</version>
103 103
 		</dependency>
104
-		<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
105
-		<dependency>
106
-			<groupId>commons-io</groupId>
107
-			<artifactId>commons-io</artifactId>
108
-			<version>1.4</version>
109
-		</dependency>
110
-		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
111
-		<dependency>
112
-			<groupId>org.apache.commons</groupId>
113
-			<artifactId>commons-lang3</artifactId>
114
-			<version>3.8.1</version>
115
-		</dependency>
116
-
117
-		<!-- https://mvnrepository.com/artifact/commons-lang/commons-lang -->
118
-		<dependency>
119
-			<groupId>commons-lang</groupId>
120
-			<artifactId>commons-lang</artifactId>
121
-			<version>2.6</version>
122
-		</dependency>
123 104
 
124 105
 		<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
125 106
 		<dependency>

+ 23
- 0
src/main/java/com/huiju/estateagents/controller/MiniAppController.java Прегледај датотеку

@@ -7,12 +7,14 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
7 7
 import com.alibaba.fastjson.JSONObject;
8 8
 import com.huiju.estateagents.base.ResponseBean;
9 9
 import com.huiju.estateagents.common.WxUtils;
10
+import com.huiju.estateagents.entity.TaMiniappQrcode;
10 11
 import com.huiju.estateagents.entity.TaPerson;
11 12
 import com.huiju.estateagents.service.IMiniAppService;
12 13
 import com.huiju.estateagents.service.ITaPersonService;
13 14
 import com.huiju.estateagents.common.JWTUtils;
14 15
 import me.chanjar.weixin.common.error.WxErrorException;
15 16
 import org.apache.commons.lang3.StringUtils;
17
+import org.apache.http.HttpStatus;
16 18
 import org.springframework.beans.factory.annotation.Autowired;
17 19
 import org.springframework.web.bind.annotation.*;
18 20
 
@@ -169,4 +171,25 @@ public class MiniAppController {
169 171
     public ResponseBean qrcode(@RequestBody String paramsStr) {
170 172
         return miniAppService.getQrCode(paramsStr);
171 173
     }
174
+
175
+    /**
176
+     * 获取二维码参数
177
+     * @param serialNo
178
+     * @return
179
+     */
180
+    @GetMapping("/qrcode/scene/{serialNo}")
181
+    public ResponseBean getScene(@PathVariable String serialNo) {
182
+        try {
183
+            Integer id = Integer.valueOf(serialNo);
184
+            TaMiniappQrcode qrcode = miniAppService.getQrCodeBySerialNo(id);
185
+            if (null == qrcode) {
186
+                return ResponseBean.error("不存在的二维码参数", HttpStatus.SC_BAD_REQUEST);
187
+            }
188
+
189
+            return ResponseBean.success(qrcode.getQrParams());
190
+        } catch (Exception e) {
191
+            e.printStackTrace();
192
+            return ResponseBean.error("获取二维码参数失败: " + e.getMessage(), HttpStatus.SC_INTERNAL_SERVER_ERROR);
193
+        }
194
+    }
172 195
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Прегледај датотеку

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

+ 14
- 7
src/main/java/com/huiju/estateagents/controller/TaCheckinController.java Прегледај датотеку

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

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaGoodsController.java Прегледај датотеку

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

+ 4
- 2
src/main/java/com/huiju/estateagents/controller/TaPointsExchangeController.java Прегледај датотеку

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

+ 3
- 0
src/main/java/com/huiju/estateagents/service/IMiniAppService.java Прегледај датотеку

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

+ 2
- 2
src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java Прегледај датотеку

@@ -34,14 +34,14 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
34 34
      * 微信小程序 项目动态管理列表
35 35
      * @return
36 36
      */
37
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId,String openid);
37
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid);
38 38
 
39 39
     /**
40 40
      * 微信小程序 项目详情
41 41
      * @param dynamicId
42 42
      * @return
43 43
      */
44
-    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId,String openid);
44
+    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,String buildingId,String openid);
45 45
 
46 46
     /**
47 47
      * 动态管理添加

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/ExtendContentServiceImpl.java Прегледај датотеку

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

+ 19
- 4
src/main/java/com/huiju/estateagents/service/impl/MiniAppServiceImpl.java Прегледај датотеку

@@ -130,17 +130,27 @@ public class MiniAppServiceImpl implements IMiniAppService {
130 130
         if (null == isHyaline) isHyaline = true;
131 131
 
132 132
         try {
133
-            File qrFile = wxService.getQrcodeService().createWxaCodeUnlimit(scene, page, width, autoColor, lineColor, isHyaline);
134
-            String qrcode = AliOSSUtils.putObject(qrFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
135 133
 
136 134
             TaMiniappQrcode taQrcode = new TaMiniappQrcode();
137 135
             taQrcode.setAppid(appid);
138 136
             taQrcode.setCreateDate(LocalDateTime.now());
139 137
             taQrcode.setExpireDate(LocalDateTime.now().plusDays(7));
140
-            taQrcode.setQrCode(qrcode);
141 138
             taQrcode.setQrParams(paramsStr);
142 139
 
143
-            taMiniappQrcodeMapper.insert(taQrcode);
140
+            boolean success = taMiniappQrcodeMapper.insert(taQrcode) > 0;
141
+            if (!success) {
142
+                return ResponseBean.error("生成二维码异常", ResponseBean.ERROR_UNAVAILABLE);
143
+            }
144
+
145
+            // 使用ID作为场景值
146
+            String newScene = String.valueOf(taQrcode.getSerialNo());
147
+            System.out.println("==========生成二维码参数--->" + newScene);
148
+
149
+            File qrFile = wxService.getQrcodeService().createWxaCodeUnlimit(newScene, page, width, autoColor, lineColor, isHyaline);
150
+            String qrcode = AliOSSUtils.putObject(qrFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
151
+            taQrcode.setQrCode(qrcode);
152
+            taMiniappQrcodeMapper.updateById(taQrcode);
153
+
144 154
             return ResponseBean.success(qrcode);
145 155
         } catch (Exception e) {
146 156
             e.printStackTrace();
@@ -148,6 +158,11 @@ public class MiniAppServiceImpl implements IMiniAppService {
148 158
         }
149 159
     }
150 160
 
161
+    @Override
162
+    public TaMiniappQrcode getQrCodeBySerialNo(Integer id) {
163
+        return taMiniappQrcodeMapper.selectById(id);
164
+    }
165
+
151 166
     private void sendMessage(String tplName, String toUser, String link, List<WxMaTemplateData> data) {
152 167
         WxProperties.Tpl tpl = WxUtils.getTplByName(tplName);
153 168
         if (null == tpl) return ;

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java Прегледај датотеку

@@ -86,7 +86,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
86 86
     }
87 87
 
88 88
     @Override
89
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId,String openid) {
89
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid) {
90 90
         Page<TaBuildingDynamic> page = new Page<>();
91 91
         page.setCurrent(pageNum);
92 92
         page.setSize(pageSize);
@@ -120,7 +120,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
120 120
     }
121 121
 
122 122
     @Override
123
-    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId,String openid) {
123
+    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,String buildingId,String openid) {
124 124
 
125 125
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
126 126
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);

+ 8
- 6
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java Прегледај датотеку

@@ -538,23 +538,25 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
538 538
 
539 539
     public void addConsultantBuildings(String personId, String paramStr) {
540 540
         JSONObject params = JSONObject.parseObject(paramStr);
541
-        JSONArray buildings = params.getJSONArray("buildings");
541
+        String building = params.getString("buildings");
542
+//        JSONArray buildings = params.getJSONArray("buildings");
542 543
 
543
-        if (null != buildings && !buildings.isEmpty()) {
544
+//        if (null != buildings && !buildings.isEmpty()) {
544 545
             // 先删除原来授权楼栋
545 546
             QueryWrapper<TaPersonBuilding> queryWrapper = new QueryWrapper<>();
546 547
             queryWrapper.eq("person_id", personId);
547 548
             taPersonBuildingMapper.delete(queryWrapper);
548 549
 
549 550
             // 再插入新的授权
550
-            for (Object b : buildings) {
551
+//            for (Object b : buildings) {
551 552
                 TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
552
-                taPersonBuilding.setBuildingId(b.toString());
553
+//                taPersonBuilding.setBuildingId(b.toString());
554
+                taPersonBuilding.setBuildingId(building);
553 555
                 taPersonBuilding.setPersonId(personId);
554 556
                 taPersonBuilding.setCreateDate(LocalDateTime.now());
555 557
                 taPersonBuildingMapper.insert(taPersonBuilding);
556
-            }
557
-        }
558
+//            }
559
+//        }
558 560
     }
559 561
 
560 562
     @Override

+ 1
- 1
src/main/resources/mapper/TaCheckinMapper.xml Прегледај датотеку

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