提交

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

@@ -476,4 +476,5 @@ public class HelpActivityController extends BaseController {
         }
         return responseBean;
     }
+
 }

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

@@ -84,7 +84,7 @@ public class TaDocumentVerifyController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/documentVerify",method= RequestMethod.POST)
-    public ResponseBean wxDocumentVerifyAdd(List<TaDocumentImg>list, HttpServletRequest request){
+    public ResponseBean wxDocumentVerifyAdd(@RequestBody List<TaDocumentImg>list, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         String openid = getOpenId(request);
@@ -178,7 +178,8 @@ public class TaDocumentVerifyController extends BaseController {
      */
     @RequestMapping(value="/wx/documentVerify/{id}",method= RequestMethod.PUT)
     public ResponseBean wxDocumentVerifyUpdate(@PathVariable Integer id,
-                                               List<TaDocumentImg>list,HttpServletRequest request){
+                                               @RequestBody List<TaDocumentImg>list,
+                                               HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         String openid = getOpenId(request);

src/main/java/com/huiju/estateagents/entity/TaDocumentImg.java

@@ -67,5 +67,9 @@ public class TaDocumentImg implements Serializable {
      */
     private String tag;
 
+    /**
+     * 排序
+     */
+    private Integer sort;
 
 }

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

@@ -76,6 +76,11 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private TaShareContentService taShareContentService;
 
+    @Autowired
+    private HelpActivityMapper helpActivityMapper;
+
+    @Autowired
+    private TaShareActivityMapper taShareActivityMapper;
 
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId) {
@@ -192,6 +197,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setPosters(taPosterService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
         building.setShareContents(taShareContentService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
 
+        // 助力活动
+
+
+        // 拼团活动
+
+
         return ResponseBean.success(building);
     }
 

src/main/resources/mapper/HelpActivityMapper.xml

@@ -31,7 +31,10 @@
             and ha.org_id=#{orgId}
         </where>
         GROUP BY ha.help_activity_id
-        order by ha.activity_status = 0 desc,ha.activity_status = 1 desc,ha.activity_status = 2 desc,ha.start_date desc
+        order by ha.activity_status = 0 desc,
+                  ha.activity_status = 1 desc,
+                  ha.activity_status = 2 desc,
+                  ha.start_date asc
     </select>
 
     <update id="updateUnStartHelpActivity">