Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

ace-common/src/main/java/com/github/wxiaoqi/security/common/rest/BaseController.java

@@ -50,7 +50,7 @@ public class BaseController<Biz extends BaseBiz,Entity> extends CommonBaseContro
     @ApiOperation("修改")
     @RequestMapping(value = "/{id}",method = RequestMethod.PUT)
     @ResponseBody
-    public ObjectRestResponse<Entity> update(@RequestBody Entity entity){
+    public ObjectRestResponse<Entity> update(@RequestBody Entity entity) throws Exception {
         baseBiz.updateSelectiveById(entity);
         return new ObjectRestResponse<Entity>();
     }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppStaffUserController.java

@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -13,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -34,14 +34,13 @@ public class AppStaffUserController extends BaseController<AppStaffUserBiz, AppS
      * @return
      * @throws Exception
      */
-    @Override
-    @GetMapping("/all")
-    public  List<AppStaffUser> all() throws Exception {
+    @GetMapping("/getAll")
+    public  ObjectRestResponse<List<AppStaffUser>> getAll() throws Exception {
         AppUserDTO userDTO = (AppUserDTO) publicController.userDetailByToken(authConfig.getToken(request)).getData();
         if (POSITION_NAME.equals(userDTO.getPositionName())) {
-         return baseBiz.getAll(userDTO.getUserid()) ;
+         return ObjectRestResponse.succ(baseBiz.getAll(userDTO.getUserid())) ;
         }
-     return new ArrayList<>();
+     return ObjectRestResponse.succ();
     }
 
     @Override
@@ -49,9 +48,12 @@ public class AppStaffUserController extends BaseController<AppStaffUserBiz, AppS
     @PostMapping(value = "")
     public ObjectRestResponse<AppStaffUser> add(@RequestBody AppStaffUser appStaffUser) throws Exception {
         AppUserDTO userDTO = (AppUserDTO) publicController.userDetailByToken(authConfig.getToken(request)).getData();
+        if (appStaffUser.getPhone().equals(userDTO.getUsername())) {
+           return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"不能绑定本人为客户");
+        }
         appStaffUser.setSuId(userDTO.getUserid());
         baseBiz.insertSelective(appStaffUser);
-        return new ObjectRestResponse<AppStaffUser>();
+        return  ObjectRestResponse.succ();
     }
 
     @ApiOperation("查询一条")
@@ -75,4 +77,17 @@ public class AppStaffUserController extends BaseController<AppStaffUserBiz, AppS
         return ObjectRestResponse.succ();
     }
 
+    @Override
+    @ApiOperation("修改")
+    @RequestMapping(value = "/{id}",method = RequestMethod.PUT)
+    @ResponseBody
+    public ObjectRestResponse update(@RequestBody AppStaffUser appStaffUser) throws Exception {
+        AppUserDTO userDTO = (AppUserDTO) publicController.userDetailByToken(authConfig.getToken(request)).getData();
+        if (appStaffUser.getPhone().equals(userDTO.getUsername())) {
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"不能绑定本人为客户");
+        }
+        baseBiz.updateSelectiveById(appStaffUser);
+        return ObjectRestResponse.succ();
+    }
+
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeBiz.java

@@ -150,7 +150,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
                     activityPopularizeUser.setCurrentProgress(bigDecimal);
                     popularizeUserBiz.updateSelectiveById(activityPopularizeUser);
                     //任务没有完成
-                    if (SYS_TRUE.equals(activityPopularizeUser.getStatus())) {
+                    if (!SYS_TRUE.equals(activityPopularizeUser.getStatus())) {
 //                AwardDTO awardDTO = JSONUtil.toBean(activityPopularize.getValue(), AwardDTO.class);
                         //检查是否满足奖励
                         if (relationBiz.selectList(new ActivityPopularizeRelation() {{

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopupBiz.java

@@ -6,7 +6,6 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.xxfc.platform.activity.entity.ActivityPopup;
 import com.xxfc.platform.activity.entity.ActivityPopupUser;
 import com.xxfc.platform.activity.mapper.ActivityPopupMapper;
-import com.xxfc.platform.activity.mapper.ActivityPopupUserMapper;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -15,9 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
-import javax.swing.plaf.synth.SynthEditorPaneUI;
 import java.math.BigInteger;
-import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -49,7 +46,7 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper, ActivityPopup
     public List<ActivityPopup> getActivityPopup(AppUserDTO userInfo) {
         if (userInfo != null) {
             List<ActivityPopup> activityPopups = getActivityPopupByTypes(loginTypes);
-            if (activityPopups == null || activityPopups.size() == 0) {
+            if (activityPopups == null || activityPopups.isEmpty()) {
                 return activityPopups;
             }
 /*            List<Integer> collect = activityPopups.parallelStream().map(ActivityPopup::getId).collect(Collectors.toList());
@@ -90,17 +87,17 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper, ActivityPopup
     /**
      * 根据不同的用户,可查询寻的类型.得到对应的弹窗
      *
-     * @param Types
+     * @param popupTypes
      * @return
      */
-    private List<ActivityPopup> getActivityPopupByTypes(String Types) {
+    private List<ActivityPopup> getActivityPopupByTypes(String popupTypes) {
         long timeMillis = System.currentTimeMillis();
         //获取有期限的弹窗timeType=1
         Example exa = new Example(ActivityPopup.class);
         Example.Criteria criteria = exa.createCriteria();
         exa.orderBy("sort").asc();
         criteria.andEqualTo("timeType",1);
-        criteria.andIn("type",Arrays.asList(Types.split(",")));
+        criteria.andIn("type",Arrays.asList(popupTypes.split(",")));
         criteria.andEqualTo("status",1);
         criteria.andEqualTo("isDel",0);
         criteria.andLessThanOrEqualTo("startTime",BigInteger.valueOf(timeMillis));
@@ -113,7 +110,7 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper, ActivityPopup
                 .where(
                         WeekendSqls.<ActivityPopup>custom()
                                 .andEqualTo(ActivityPopup::getTimeType, 0)
-                                .andIn(ActivityPopup::getType, Arrays.asList(Types.split(",")))
+                                .andIn(ActivityPopup::getType, Arrays.asList(popupTypes.split(",")))
                                 .andEqualTo(ActivityPopup::getStatus, 1)
                                 .andEqualTo(ActivityPopup::getIsDel, 0)
                 ).orderByAsc("sort").build();
@@ -138,7 +135,7 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper, ActivityPopup
                             .andEqualTo(ActivityPopupUser::getUserId, userInfo.getUserid())
             ).build();
             List<ActivityPopupUser> activityPopupUsers = activityPopupUserBiz.selectByExample(exa);
-            if (activityPopupUsers == null || activityPopupUsers.size() == 0) {
+            if (activityPopupUsers == null || activityPopupUsers.isEmpty()) {
                 ActivityPopupUser activityPopupUser = new ActivityPopupUser();
                 activityPopupUser.setPopupId(id);
                 activityPopupUser.setUserId(userInfo.getUserid());

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/Banner.java

@@ -80,6 +80,10 @@ public class Banner {
     @ApiModelProperty(value = "跳转链接")
     private String url;
 
+    @Column(name = "ios_url")
+    @ApiModelProperty(value = "ios跳转地址")
+    private String iosUrl;
+
     /**
      * 是否删除，0否，1是
      */

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/vo/BannerVo.java

@@ -24,6 +24,8 @@ public class BannerVo {
      */
     private String url;
 
+    private String iosUrl;
+
     /**
      * seo html标签优化
      */

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/BannerBiz.java

@@ -31,6 +31,7 @@ public class BannerBiz extends BaseBiz<BannerMapper,Banner> {
             bannerVo.setTitle(banner.getTitle());
             bannerVo.setId(banner.getId());
             bannerVo.setAlt(banner.getAlt());
+            bannerVo.setIosUrl(banner.getIosUrl());
             bannerVos.add(bannerVo);
         });
         return bannerVos;