wangfei il y a 6 ans
Parent
révision
cbcabc7501

+ 1
- 1
whole-estate/src/main/java/com/example/wholeestate/controller/ActivityController.java Voir le fichier

@@ -204,7 +204,7 @@ public class ActivityController extends BaseController {
204 204
     @RequestMapping(value = "/wx/signUpActivity/{openid}", method = RequestMethod.POST)
205 205
     @ApiOperation(value = "微信小程序活动报名", notes = "微信小程序活动报名")
206 206
     @ApiImplicitParams({
207
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "activityId活动编号;enrollDate报名时间"),
207
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "activityId活动编号;"),
208 208
     })
209 209
     public ResponseBean wxSignUpActivity(@PathVariable("openid") String openid, @RequestBody String parameter) {
210 210
         ResponseBean responseBean = new ResponseBean();

+ 4
- 2
whole-estate/src/main/java/com/example/wholeestate/model/Activity.java Voir le fichier

@@ -101,9 +101,12 @@ public class Activity implements Serializable {
101 101
     /**
102 102
      * 客户手机号
103 103
      */
104
-    @TableField(exist = false)
105 104
     private String phone;
106 105
 
106
+    /**
107
+     * 身份证号
108
+     */
109
+    private String idNum;
107 110
     /**
108 111
      * 微信昵称
109 112
      */
@@ -113,7 +116,6 @@ public class Activity implements Serializable {
113 116
     /**
114 117
      * 客户姓名
115 118
      */
116
-    @TableField(exist = false)
117 119
     private String customerName;
118 120
 
119 121
     /**

+ 2
- 0
whole-estate/src/main/java/com/example/wholeestate/service/impl/ActivityEnrollServiceImpl.java Voir le fichier

@@ -17,6 +17,7 @@ import com.example.wholeestate.service.IActivityEnrollService;
17 17
 import org.springframework.beans.factory.annotation.Autowired;
18 18
 import org.springframework.stereotype.Service;
19 19
 
20
+import java.time.LocalDateTime;
20 21
 import java.util.Map;
21 22
 
22 23
 /**
@@ -88,6 +89,7 @@ public class ActivityEnrollServiceImpl extends ServiceImpl<ActivityEnrollMapper,
88 89
         ActivityEnroll activityEnroll = JSONObject.parseObject(parameter, ActivityEnroll.class);
89 90
         activityEnroll.setCustomerId(customer.getCustomerId());
90 91
         activityEnroll.setEnrollId(idGen.nextId()+"");
92
+        activityEnroll.setEnrollDate(LocalDateTime.now());
91 93
         int row = activityEnrollMapper.insert(activityEnroll);
92 94
         if (row <= 0) {
93 95
             responseBean.addError("报名失败!");

+ 1
- 1
whole-estate/src/main/java/com/example/wholeestate/service/impl/ImageServiceimpl.java Voir le fichier

@@ -22,7 +22,7 @@ public class ImageServiceimpl implements ImageService {
22 22
     private static String endpoint = "http://oss-cn-shanghai.aliyuncs.com";
23 23
     private static String accessKeyId = "LTAIkc75dpkJw8Lb";
24 24
     private static String accessKeySecret = "v4bvXCaix6vSDTCFfwSAdqV53iFEQw";
25
-    private static String bucketName = "jingcheng-h5temp";
25
+    private static String bucketName = "whole-estate";
26 26
 
27 27
     @Override
28 28
     public String getImageUrl(MultipartFile uploadFile) throws IOException {

+ 2
- 2
whole-estate/src/main/resources/mapper/ActivityEnrollMapper.xml Voir le fichier

@@ -4,8 +4,8 @@
4 4
 
5 5
     <select id="selectPageActivityEnroll" resultType="map">
6 6
         SELECT
7
-          tacus.phone as phone,tacus.`name` as name,tacus.customer_name as customerName,tab.building_name AS buildingName,
8
-          tacus.id_num as idNum, tacus.avatar as avatar, tace.enroll_date as enrollDate
7
+        tace.phone as phone,tacus.`name` as name,tace.customer_name as customerName,tab.building_name AS buildingName,
8
+        tace.id_num as idNum, tacus.avatar as avatar, tace.enroll_date as enrollDate
9 9
         FROM ta_activity tac
10 10
         RIGHT JOIN ta_activity_enroll tace ON tac.activity_id = tace.activity_id
11 11
         LEFT JOIN ta_customer tacus ON tace.customer_id = tacus.customer_id