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

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/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();
+    }
+
+
+
+}