Merge remote-tracking branch 'origin/dev-chw' into dev-chw

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/BaseUserDTO.java

@@ -38,4 +38,6 @@ public class BaseUserDTO extends PageParam implements DataInter {
     List<Integer> dataCompanyIds;
 
     Integer bizType;
+
+    Integer status;
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseCommissionRatio.java

+package com.github.wxiaoqi.security.admin.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ * 拥金比例设置表
+ * 
+ * @author zjw
+ * @email 18178966185@163.com
+ * @date 2019-07-11 18:34:39
+ */
+@Data
+@Table(name = "base_commission_ratio")
+public class BaseCommissionRatio implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键id")
+    private Integer id;
+	
+
+    @Column(name = "type")
+	@ApiModelProperty(value = "1-商户推荐人；2-上级；3-平台")
+    private Integer type;
+	
+
+
+    @Column(name = "extract")
+	@ApiModelProperty(value = "拥金比例")
+    private BigDecimal extract;
+
+
+	@Column(name = "content")
+	@ApiModelProperty(value = "拥金说明")
+	private String content;
+
+
+	@Column(name = "status")
+	@ApiModelProperty(value = "状态：1-启用；2-禁止")
+	private Integer status;
+	
+
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

@@ -218,7 +218,7 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
     //永久稳定关系
     public void foreverBind(Integer user_id) {
         AppUserRelation relation = getMyBiz().getRelationByUserId(user_id);
-        if (relation != null && relation.getIsForever() == 0 && relation.getParentId() != null && relation.getParentId() > 0) {
+        if (relation != null && relation.getIsForever() == 0 &&( (relation.getParentId() != null && relation.getParentId() > 0) || (relation.getCompanyId() != null && relation.getCompanyId() > 0) )) {
             relation.setIsForever(1);
             getMyBiz().updRelation(relation);
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseCommissionRatioBiz.java

+package com.github.wxiaoqi.security.admin.biz;
+
+import com.github.wxiaoqi.security.admin.entity.BaseCommissionRatio;
+import com.github.wxiaoqi.security.admin.entity.BaseGoodCommission;
+import com.github.wxiaoqi.security.admin.mapper.BaseCommissionRatioMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 拥金比例
+ *
+ * @author zjw
+ * @email 18178966185@163.com
+ * @date 2019-07-11 18:34:39
+ */
+@Service
+public class BaseCommissionRatioBiz extends BaseBiz<BaseCommissionRatioMapper, BaseCommissionRatio> {
+
+
+
+    public BigDecimal getExtract(Integer type){
+        Example example=new Example(BaseGoodCommission.class);
+        example.createCriteria().andEqualTo("type", type).andEqualTo("status",1);
+        List<BaseCommissionRatio> list = mapper.selectByExample(example);
+        if (list != null && list.size() != 0) {
+            return list.get(0).getExtract();
+        }
+      return  BigDecimal.ZERO;
+    }
+
+}
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/BaseCommissionRatioMapper.java

+package com.github.wxiaoqi.security.admin.mapper;
+
+import com.github.wxiaoqi.security.admin.entity.BaseCommissionRatio;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 拥金比例设置表
+ * 
+ * @author zjw
+ * @email 18178966185@163.com
+ * @date 2019-07-11 18:34:39
+ */
+public interface BaseCommissionRatioMapper extends Mapper<BaseCommissionRatio> {
+	
+}

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

@@ -6,6 +6,9 @@ import com.github.wxiaoqi.security.admin.biz.ResourceAuthorityBiz;
 import com.github.wxiaoqi.security.admin.constant.AdminCommonConstant;
 import com.github.wxiaoqi.security.admin.entity.Element;
 import com.github.wxiaoqi.security.admin.entity.Group;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
+import com.github.wxiaoqi.security.admin.rpc.UserRest;
 import com.github.wxiaoqi.security.admin.vo.AuthorityMenuTree;
 import com.github.wxiaoqi.security.admin.vo.GroupTree;
 import com.github.wxiaoqi.security.admin.vo.GroupUsers;
@@ -35,10 +38,18 @@ import java.util.List;
 @Controller
 @RequestMapping("group")
 @Api("群组模块")
-public class GroupController extends BaseController<GroupBiz, Group> {
+public class GroupController extends BaseController<GroupBiz, Group> implements UserRestInterface {
     @Autowired
     private ResourceAuthorityBiz resourceAuthorityBiz;
 
+    @Autowired
+    UserFeign userFeign;
+
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
+
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
     public List<Group> list(String name,String groupType) {
@@ -68,6 +79,13 @@ public class GroupController extends BaseController<GroupBiz, Group> {
         return baseBiz.selectListAll();
     }
 
+    @GetMapping(value = "/authority/list_all")
+    @ResponseBody
+    public List<Group> authorityListAll() {
+        return baseBiz.selectList(new Group(){{
+            setGroupType(getAdminUserInfo().getBizType());
+        }});
+    }
 
     @RequestMapping(value = "/{id}/user", method = RequestMethod.PUT)
     @ResponseBody

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

+package com.github.wxiaoqi.security.admin.rest.admin;
+
+import com.github.wxiaoqi.security.admin.biz.BaseCommissionRatioBiz;;
+import com.github.wxiaoqi.security.admin.entity.BaseCommissionRatio;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Slf4j
+@RestController
+@RequestMapping("backstage/commissionRatio")
+@Api(tags = {"拥金比例"})
+public class AdminBaseCommissionRatioController extends BaseController<BaseCommissionRatioBiz, BaseCommissionRatio> implements UserRestInterface {
+
+
+    @Autowired
+    UserFeign userFeign;
+
+
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
+
+
+    @GetMapping("selectList")
+    @ApiModelProperty("列表")
+    public  ObjectRestResponse selectList(BaseCommissionRatio baseCommissionRatio) {
+     return ObjectRestResponse.succ( baseBiz.selectListAll());
+    }
+
+
+    @PostMapping("setting")
+    @ApiModelProperty("设置")
+    public  ObjectRestResponse setting(@RequestBody List<BaseCommissionRatio> commissionRatios) {
+        for (BaseCommissionRatio commissionRatio:commissionRatios) {
+            baseBiz.updateSelectiveById(commissionRatio);
+        }
+        return ObjectRestResponse.succ();
+    }
+
+
+
+}

ace-modules/ace-admin/src/main/resources/mapper/UserMapper.xml

@@ -72,6 +72,9 @@
     LEFT JOIN company_info ci ON u.corporation_id=ci.id
     <where>
         u.is_del = 0
+      <if test="status != null">
+        and u.status = #{status}
+      </if>
       <if test="bizType != null">
         and u.biz_type = #{bizType}
       </if>

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

@@ -134,7 +134,7 @@ public class Banner {
      * 跳转 商品/店铺 id；
      */
     @Column(name = "jump_id")
-    private Integer jumpId;
+    private String jumpId;
 
     /**
      * 状态 1--上架；2--下架

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

@@ -39,8 +39,8 @@ public class BannerBiz extends BaseBiz<BannerMapper,Banner> {
      * @param pageSize
      * @return
      */
-    public PageDataVO<Banner> findBannePage(Integer pageNo, Integer pageSize,Integer platform) {
-        return  PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.findBannerListByisDelOrderByRank(Banner.builder().isDel(0).platform(platform).build()));
+    public PageDataVO<Banner> findBannePage(Integer pageNo, Integer pageSize,Integer platform, Integer status, Integer location) {
+        return  PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.findBannerListByisDelOrderByRank(Banner.builder().isDel(0).platform(platform).status(status).location(location).build()));
     }
 
     /**

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/mapper/BannerMapper.java

@@ -19,7 +19,10 @@ import java.util.List;
 @Repository
 public interface BannerMapper extends Mapper<Banner> {
 
-    @Select("select * from `banner` where is_del=#{isDel} and `platform`=#{platform} order by rank ASC")
+    @Select("select * from `banner` where is_del=#{isDel} and `platform`=#{platform}  " +
+            " <when test='status != null'> and `status`=#{status} </when > " +
+            " <when test='location != null'> and `location`=#{location} </when > " +
+            "order by rank ASC")
     List<Banner> findBannerListByisDelOrderByRank(Banner banner);
 
 

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/admin/BannerAdminController.java

@@ -82,9 +82,11 @@ public class BannerAdminController implements UserRestInterface {
     })
     public ObjectRestResponse<PageDataVO> findBannerPage(@RequestParam(name = "pageNo", defaultValue = "0", required = false) Integer pageNo,
                                                          @RequestParam(name = "pageSize", defaultValue = "10", required = false) Integer pageSize,
+                                                         @RequestParam(name = "status", required = false) Integer status,
+                                                         @RequestParam(name = "location", required = false) Integer location,
                                                          @RequestParam(name = "platform", defaultValue = "0", required = false) Integer platform) {
 
-        PageDataVO<Banner> pageDataVO = bannerBiz.findBannePage(pageNo, pageSize, platform);
+        PageDataVO<Banner> pageDataVO = bannerBiz.findBannePage(pageNo, pageSize, platform, status, location);
 
         return ObjectRestResponse.succ(pageDataVO);
     }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePlatCataBiz.java

@@ -161,6 +161,9 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
         List<VehiclePlatCata> vehiclePlatCatas = childrens.parallelStream().filter(vehiclePlatCata -> {
             vehiclePlatCata.setParentId(parentId);
             vehiclePlatCata.setCrtTime(System.currentTimeMillis());
+            if(null == vehiclePlatCata.getRank()) {
+                vehiclePlatCata.setRank(1);
+            }
             return vehiclePlatCata.getState() == 0;
         }).filter(vpc -> StringUtils.isNotBlank(vpc.getName())).collect(Collectors.toList());