yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_java

This commit is contained in:
yangjun 2024-08-08 15:09:41 +08:00
parent 4bb5dbfa67 93a219bc26
commit 7ae902ee19
16 changed files with 2176 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/sqx/modules/artificer/entity/Orders.java
View File

@ -608,10 +608,6 @@ public class Orders implements Serializable {
@TableField(exist = false)
private String zxsc;
/**
* 经纪人分佣
*/
private BigDecimal jjrMoney;
/**
* 经纪人ID
*/
@ -621,9 +617,13 @@ public class Orders implements Serializable {
*/
private String jjrUserName;
/**
* 一级分销员分佣
* 经纪人分佣
*/
private BigDecimal fxyOneMoney;
private BigDecimal jjrMoney;
/**
* 经纪人分佣技师承担金额
*/
private BigDecimal jjrArtificerDeductMoney;
/**
* 一级分销员ID
*/
@ -633,9 +633,13 @@ public class Orders implements Serializable {
*/
private String fxyOneUserName;
/**
* 二级分销员分佣
* 一级分销员分佣
*/
private BigDecimal fxyTwoMoney;
private BigDecimal fxyOneMoney;
/**
* 一级分销员分佣技师承担金额
*/
private BigDecimal fxyOneArtificerDeductMoney;
/**
* 二级分销员ID
*/
@ -644,6 +648,14 @@ public class Orders implements Serializable {
* 二级分销员姓名
*/
private String fxyTwoUserName;
/**
* 二级分销员分佣
*/
private BigDecimal fxyTwoMoney;
/**
* 二级分销员分佣技师承担金额
*/
private BigDecimal fxyTwoArtificerDeductMoney;
public Orders() {}
}

1195
src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

4
src/main/java/com/sqx/modules/bl/commission/fxy/controller/app/AppFxyController.java
View File

@ -24,10 +24,10 @@ public class AppFxyController {
private FxyApplyService service;
@Autowired
private FxyDataService dataService;
private FxyConfigService configService;
@Autowired
private FxyConfigService configService;
private FxyDataService dataService;
@PostMapping("/fxyConfig")
@ApiOperation("获取分销员配置")

3
src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrConfigController.java
View File

@ -23,8 +23,6 @@ public class JjrConfigController {
@Autowired
private JjrConfigService service;
@Autowired
private JjrApplyService applyService;
@GetMapping("/info")
@ApiOperation("查询经纪人配置")
@ -47,7 +45,6 @@ public class JjrConfigController {
jjrConfig.setCreateTime(sdf.format(new Date()));
service.save(jjrConfig);
}
applyService.setJjrRate(null);
return Result.success();
}
}

51
src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrConfigLevelController.java Normal file
View File

@ -0,0 +1,51 @@
package com.sqx.modules.bl.commission.jjr.controller;
import com.sqx.common.utils.Result;
import com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel;
import com.sqx.modules.bl.commission.jjr.service.JjrConfigLevelService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@RequestMapping("/commission/jjrConfigLevel")
@Api(value = "分佣管理", tags = {"经纪人配置等级"})
public class JjrConfigLevelController {
@Autowired
private JjrConfigLevelService service;
@GetMapping("/findList")
@ApiOperation("查询列表")
public Result findList(JjrConfigLevel jjrConfigLevel){
return Result.success().put("data",service.findList(jjrConfigLevel));
}
@PostMapping("/add")
@ApiOperation("添加")
public Result add(JjrConfigLevel jjrConfigLevel){
service.add(jjrConfigLevel);
return Result.success();
}
@PostMapping("/update")
@ApiOperation("修改")
public Result update(JjrConfigLevel jjrConfigLevel){
service.update(jjrConfigLevel);
return Result.success();
}
@PostMapping("/delete")
@ApiOperation("删除")
public Result delete(JjrConfigLevel jjrConfigLevel){
service.removeById(jjrConfigLevel.getId());
return Result.success();
}
}

1
src/main/java/com/sqx/modules/bl/commission/jjr/dao/JjrApplyDao.java
View File

@ -17,5 +17,4 @@ public interface JjrApplyDao extends BaseMapper<JjrApply> {
int update(JjrApply jjrApply);
int approve(JjrApply jjrApply);
IPage<JjrApply> findUserPage(Page<JjrApply> page, @Param("params") JjrApply jjrApply);
int setRate(JjrApply jjrApply);
}

13
src/main/java/com/sqx/modules/bl/commission/jjr/dao/JjrConfigLevelDao.java Normal file
View File

@ -0,0 +1,13 @@
package com.sqx.modules.bl.commission.jjr.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface JjrConfigLevelDao extends BaseMapper<JjrConfigLevel> {
List<JjrConfigLevel> findList(JjrConfigLevel jjrConfigLevel);
int add(JjrConfigLevel jjrConfigLevel);
int update(JjrConfigLevel jjrConfigLevel);
}

61
src/main/java/com/sqx/modules/bl/commission/jjr/entity/JjrConfigLevel.java Normal file
View File

@ -0,0 +1,61 @@
package com.sqx.modules.bl.commission.jjr.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @description bl_jjr_config_level
* 经纪人配置等级表
* @author caolei
* @date 2024-08-07
*/
@Data
@TableName("bl_jjr_config_level")
public class JjrConfigLevel implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.AUTO)
/**
* ID
*/
private Long id;
/**
*经纪人等级
*/
private String level;
/**
*最小邀请技师人数
*/
private Integer minNumber;
/**
*最大邀请技师人数
*/
private Integer maxNumber;
/**
*请技师人数
*/
private String peopleNumber;
/**
*经纪人返佣比例
*/
private BigDecimal rate;
/**
*创建时间
*/
private String createTime;
@TableField(exist = false)
private Integer page;
@TableField(exist = false)
private Integer limit;
public JjrConfigLevel() {}
}

1
src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrApplyService.java
View File

@ -10,5 +10,4 @@ public interface JjrApplyService extends IService<JjrApply> {
int update(JjrApply jjrApply);
void approve(JjrApply jjrApply);
Result findUserPage(JjrApply jjrApply);
void setJjrRate(JjrApply jjrApply);
}

13
src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrConfigLevelService.java Normal file
View File

@ -0,0 +1,13 @@
package com.sqx.modules.bl.commission.jjr.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.sqx.common.utils.Result;
import com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel;
import java.util.List;
public interface JjrConfigLevelService extends IService<JjrConfigLevel> {
List<JjrConfigLevel> findList(JjrConfigLevel jjrConfigLevel);
int add(JjrConfigLevel jjrConfigLevel);
int update(JjrConfigLevel jjrConfigLevel);
}

32
src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrApplyServiceImpl.java
View File

@ -8,7 +8,9 @@ import com.sqx.common.utils.Result;
import com.sqx.modules.bl.commission.jjr.dao.JjrApplyDao;
import com.sqx.modules.bl.commission.jjr.entity.JjrApply;
import com.sqx.modules.bl.commission.jjr.entity.JjrConfig;
import com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel;
import com.sqx.modules.bl.commission.jjr.service.JjrApplyService;
import com.sqx.modules.bl.commission.jjr.service.JjrConfigLevelService;
import com.sqx.modules.bl.commission.jjr.service.JjrConfigService;
import com.sqx.modules.sys.entity.SysUserEntity;
import org.apache.shiro.SecurityUtils;
@ -25,6 +27,9 @@ public class JjrApplyServiceImpl extends ServiceImpl<JjrApplyDao, JjrApply> impl
@Autowired
private JjrConfigService configService;
@Autowired
private JjrConfigLevelService configLevelService;
@Override
public Result findPage(JjrApply jjrApply){
Page<JjrApply> pages=new Page<>(jjrApply.getPage(),jjrApply.getLimit());
@ -50,7 +55,6 @@ public class JjrApplyServiceImpl extends ServiceImpl<JjrApplyDao, JjrApply> impl
jjrApply.setApproveTime(sdf.format(new Date()));
jjrApply.setApproveUser(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId());
baseMapper.approve(jjrApply);
setJjrRate(jjrApply);
}
@Override
@ -59,30 +63,4 @@ public class JjrApplyServiceImpl extends ServiceImpl<JjrApplyDao, JjrApply> impl
return Result.success().put("data",new PageUtils(baseMapper.findUserPage(pages,jjrApply)));
}
@Override
public void setJjrRate(JjrApply jjrApply){
JjrConfig jjrConfig = configService.getOne(new QueryWrapper<JjrConfig>());
if(jjrConfig != null){
if(jjrApply == null){
List<JjrApply> list = baseMapper.findList(null);
for(int i=0;i<list.size();i++){
JjrApply entity = list.get(i);
BigDecimal rate = jjrConfig.getRate();
rate = rate.divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
entity.setRate(rate);
baseMapper.setRate(entity);
}
}else{
JjrApply entity = baseMapper.selectById(jjrApply.getId());
if(jjrApply.getStatus() == 1){
BigDecimal rate = jjrConfig.getRate();
rate = rate.divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
entity.setRate(rate);
}else if(jjrApply.getStatus() == 2){
entity.setRate(BigDecimal.ZERO);
}
baseMapper.setRate(entity);
}
}
}
}

33
src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrConfigLevelServiceImpl.java Normal file
View File

@ -0,0 +1,33 @@
package com.sqx.modules.bl.commission.jjr.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sqx.common.utils.Result;
import com.sqx.modules.bl.commission.jjr.dao.JjrConfigLevelDao;
import com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel;
import com.sqx.modules.bl.commission.jjr.service.JjrConfigLevelService;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@Service
public class JjrConfigLevelServiceImpl extends ServiceImpl<JjrConfigLevelDao, JjrConfigLevel> implements JjrConfigLevelService {
@Override
public List<JjrConfigLevel> findList(JjrConfigLevel jjrConfigLevel){
return baseMapper.findList(jjrConfigLevel);
}
@Override
public int add(JjrConfigLevel jjrConfigLevel){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
jjrConfigLevel.setCreateTime(sdf.format(new Date()));
return baseMapper.add(jjrConfigLevel);
}
@Override
public int update(JjrConfigLevel jjrConfigLevel){
return baseMapper.update(jjrConfigLevel);
}
}

467
src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java
View File

@ -29,7 +29,9 @@ import com.sqx.modules.artificer.dao.UserRechargeDao;
import com.sqx.modules.artificer.entity.*;
import com.sqx.modules.artificer.service.*;
import com.sqx.modules.bl.commission.fxy.entity.FxyApply;
import com.sqx.modules.bl.commission.fxy.entity.FxyConfig;
import com.sqx.modules.bl.commission.fxy.service.FxyApplyService;
import com.sqx.modules.bl.commission.fxy.service.FxyConfigService;
import com.sqx.modules.bl.massage.entity.MassagePackage;
import com.sqx.modules.bl.massage.service.MassagePackageService;
import com.sqx.modules.bl.order.dao.UserPackageOrderDao;
@ -153,10 +155,11 @@ public class AliPayController {
private BlSadJobService blSadJobService;
@Autowired
private FxyApplyService fxyApplyService;
@Autowired
private FxyConfigService fxyConfigService;
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/**
* 获取总花费时间
* @param duration 服务时长
@ -672,20 +675,136 @@ public class AliPayController {
}
}
orders.setShopMoney(shopMoney);
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
BigDecimal oneUserMoney = BigDecimal.ZERO;
if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
orders.setOneUserId(oneUser.getUserId());
orders.setOneUserName(oneUser.getUserName());
oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
oneUserMoney = oneUserMoney.setScale(2, BigDecimal.ROUND_HALF_UP);
// UserEntity user = userService.selectUserById(orders.getUserId());
// UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
// BigDecimal oneUserMoney = BigDecimal.ZERO;
// if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
// orders.setOneUserId(oneUser.getUserId());
// orders.setOneUserName(oneUser.getUserName());
// oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
// oneUserMoney = oneUserMoney.setScale(2, BigDecimal.ROUND_HALF_UP);
// }
// orders.setOneUserMoney(oneUserMoney);
//分销商分佣
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
if(fc.getIsOpen().equals(1)){
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
if(faOne.getStatus().equals(1)){
if(fxyOneUser!=null && fxyOneUser.getBlIsFxy() !=null && fxyOneUser.getBlIsFxy() ==1){
boolean isCanFxyFy = false;
if(fc.getFxmLimit().equals(2)){
int fxmLimitDays = fc.getFxmLimitDays();
String approveTime = faOne.getApproveTime();
Date approveDate = DateUtils.stringToDate(approveTime,DateUtils.DATE_TIME_PATTERN);
Calendar calendar = Calendar.getInstance();
calendar.setTime(approveDate);
calendar.add(Calendar.DAY_OF_MONTH, fxmLimitDays);
approveDate = calendar.getTime();
Date current = new Date();
if(approveDate.getTime() > current.getTime()){
isCanFxyFy = true;
}
}else{
isCanFxyFy = true;
}
if(isCanFxyFy){
orders.setFxyOneUserId(fxyOneUser.getUserId());
orders.setFxyOneUserName(fxyOneUser.getUserName());
BigDecimal fxyMoney = BigDecimal.ZERO;
if(fc.getType().equals(1)){
fxyMoney = artificerPrice;
}
if(fc.getType().equals(2)){
fxyMoney = subtract;
}
BigDecimal artificerRate = fc.getArtificerRate();
BigDecimal mostRate = fc.getMostRate();
BigDecimal oneRate = fc.getOneRate();
BigDecimal oneRecommendRate = fc.getOneRecommendRate();
BigDecimal fxyRate = BigDecimal.ZERO;
if(oneRate == null || oneRate.compareTo(BigDecimal.ZERO) == 0){
fxyRate = oneRecommendRate;
if(oneRecommendRate.compareTo(mostRate)> 0){
fxyRate = mostRate;
}
}else{
fxyRate = oneRate;
if(oneRate.compareTo(mostRate)> 0){
fxyRate = mostRate;
}
}
BigDecimal fxyOneMoney = fxyMoney.multiply(fxyRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setFxyOneMoney(fxyOneMoney);
BigDecimal fxyOneArtificerDeductMoney = fxyOneMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setFxyOneArtificerDeductMoney(fxyOneArtificerDeductMoney);
if(fxyOneUser.getBlFxyLevel().equals(1)){
UserEntity fxyTwoUser = userService.queryByInvitationCode(fxyOneUser.getBlFxyCode());
FxyApply faTwo = fxyApplyService.findByUserId(fxyTwoUser.getUserId());
if(faTwo.getStatus().equals(1)){
if(fxyTwoUser!=null && fxyTwoUser.getBlIsFxy() !=null && fxyTwoUser.getBlIsFxy() ==1){
isCanFxyFy = false;
if(fc.getFxmLimit().equals(2)){
int fxmLimitDays = fc.getFxmLimitDays();
String approveTime = faTwo.getApproveTime();
Date approveDate = DateUtils.stringToDate(approveTime,DateUtils.DATE_TIME_PATTERN);
Calendar calendar = Calendar.getInstance();
calendar.setTime(approveDate);
calendar.add(Calendar.DAY_OF_MONTH, fxmLimitDays);
approveDate = calendar.getTime();
Date current = new Date();
if(approveDate.getTime() > current.getTime()){
isCanFxyFy = true;
}
}else{
isCanFxyFy = true;
}
if(isCanFxyFy) {
orders.setFxyTwoUserId(fxyTwoUser.getUserId());
orders.setFxyTwoUserName(fxyTwoUser.getUserName());
BigDecimal twoRate = fc.getTwoRate();
BigDecimal twoRecommendRate = fc.getTwoRecommendRate();
fxyRate = BigDecimal.ZERO;
if (twoRate == null || twoRate.compareTo(BigDecimal.ZERO) == 0) {
fxyRate = twoRecommendRate;
if (twoRecommendRate.compareTo(mostRate) > 0) {
fxyRate = mostRate;
}
} else {
fxyRate = twoRate;
if (twoRate.compareTo(mostRate) > 0) {
fxyRate = mostRate;
}
}
BigDecimal fxyTwoMoney = fxyMoney.multiply(fxyRate).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
orders.setFxyTwoMoney(fxyTwoMoney);
BigDecimal fxyTwoArtificerDeductMoney = fxyTwoMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
orders.setFxyTwoArtificerDeductMoney(fxyTwoArtificerDeductMoney);
}
}
}
}else{
orders.setFxyTwoMoney(BigDecimal.ZERO);
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
}
}
}
}
}else{
orders.setFxyOneMoney(BigDecimal.ZERO);
orders.setFxyOneArtificerDeductMoney(BigDecimal.ZERO);
orders.setFxyTwoMoney(BigDecimal.ZERO);
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
}
orders.setOneUserMoney(oneUserMoney);
// artificerPrice = artificerPrice.subtract(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney);
artificerPrice = artificerPrice.subtract(shopMoney);
artificerPrice = artificerPrice.subtract(oneUserMoney);
// artificerPrice = artificerPrice.subtract(oneUserMoney);
artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担
artificerPrice = artificerPrice.subtract(orders.getFxyTwoArtificerDeductMoney());//减掉二级分销商分佣技师承担
if(orders.getIsSupplement()!=null && orders.getIsSupplement().equals(2)){
}else{
//用户收益加上通行费用
@ -700,7 +819,9 @@ public class AliPayController {
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney);
pingMoney = pingMoney.subtract(oneUserMoney);
// pingMoney = pingMoney.subtract(oneUserMoney);
pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣
pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣
orders.setPingMoney(pingMoney);
ordersService.updateById(orders);
@ -774,9 +895,17 @@ public class AliPayController {
if(orders1.getAddMoney()!=null){
orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney()));
orders1.setAddArtificerMoney(orders1.getAddArtificerMoney().add(orders.getArtificerMoney()));
orders1.setAddProjectBenefits(orders1.getProjectBenefits().add(orders.getProjectBenefits()));
orders1.setAddPriceMarkup(orders1.getAddPriceMarkup().add(orders.getPriceMarkup()));
orders1.setAddTechnicianMoney(orders1.getAddTechnicianMoney().add(orders.getTechnicianMoney()));
orders1.setAddVipReductionMoney(orders1.getAddVipReductionMoney().add(orders.getVipReductionMoney()));
}else{
orders1.setAddMoney(orders.getPayMoney());
orders1.setAddArtificerMoney(orders.getArtificerMoney());
orders1.setAddProjectBenefits(orders.getProjectBenefits());
orders1.setAddPriceMarkup(orders.getPriceMarkup());
orders1.setAddTechnicianMoney(orders.getTechnicianMoney());
orders1.setAddVipReductionMoney(orders.getVipReductionMoney());
}
orders1.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney()));
orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney()));
@ -784,7 +913,11 @@ public class AliPayController {
// orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney()));
orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney()));
orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney()));
orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney()));
// orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney()));
orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney()));
orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney()));
orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney()));
orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney()));
orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney()));
if(orders1.getStatus().equals(6)){
@ -1620,20 +1753,136 @@ public class AliPayController {
}
}
orders.setShopMoney(shopMoney);
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
BigDecimal oneUserMoney = BigDecimal.ZERO;
if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
orders.setOneUserId(oneUser.getUserId());
orders.setOneUserName(oneUser.getUserName());
oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
oneUserMoney = oneUserMoney.setScale(0, BigDecimal.ROUND_HALF_UP);
// UserEntity user = userService.selectUserById(orders.getUserId());
// UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
// BigDecimal oneUserMoney = BigDecimal.ZERO;
// if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
// orders.setOneUserId(oneUser.getUserId());
// orders.setOneUserName(oneUser.getUserName());
// oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
// oneUserMoney = oneUserMoney.setScale(0, BigDecimal.ROUND_HALF_UP);
// }
// orders.setOneUserMoney(oneUserMoney);
//分销商分佣
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
if(fc.getIsOpen().equals(1)){
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
if(faOne.getStatus().equals(1)){
if(fxyOneUser!=null && fxyOneUser.getBlIsFxy() !=null && fxyOneUser.getBlIsFxy() ==1){
boolean isCanFxyFy = false;
if(fc.getFxmLimit().equals(2)){
int fxmLimitDays = fc.getFxmLimitDays();
String approveTime = faOne.getApproveTime();
Date approveDate = DateUtils.stringToDate(approveTime,DateUtils.DATE_TIME_PATTERN);
Calendar calendar = Calendar.getInstance();
calendar.setTime(approveDate);
calendar.add(Calendar.DAY_OF_MONTH, fxmLimitDays);
approveDate = calendar.getTime();
Date current = new Date();
if(approveDate.getTime() > current.getTime()){
isCanFxyFy = true;
}
}else{
isCanFxyFy = true;
}
if(isCanFxyFy){
orders.setFxyOneUserId(fxyOneUser.getUserId());
orders.setFxyOneUserName(fxyOneUser.getUserName());
BigDecimal fxyMoney = BigDecimal.ZERO;
if(fc.getType().equals(1)){
fxyMoney = artificerPrice;
}
if(fc.getType().equals(2)){
fxyMoney = subtract;
}
BigDecimal artificerRate = fc.getArtificerRate();
BigDecimal mostRate = fc.getMostRate();
BigDecimal oneRate = fc.getOneRate();
BigDecimal oneRecommendRate = fc.getOneRecommendRate();
BigDecimal fxyRate = BigDecimal.ZERO;
if(oneRate == null || oneRate.compareTo(BigDecimal.ZERO) == 0){
fxyRate = oneRecommendRate;
if(oneRecommendRate.compareTo(mostRate)> 0){
fxyRate = mostRate;
}
}else{
fxyRate = oneRate;
if(oneRate.compareTo(mostRate)> 0){
fxyRate = mostRate;
}
}
BigDecimal fxyOneMoney = fxyMoney.multiply(fxyRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setFxyOneMoney(fxyOneMoney);
BigDecimal fxyOneArtificerDeductMoney = fxyOneMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setFxyOneArtificerDeductMoney(fxyOneArtificerDeductMoney);
if(fxyOneUser.getBlFxyLevel().equals(1)){
UserEntity fxyTwoUser = userService.queryByInvitationCode(fxyOneUser.getBlFxyCode());
FxyApply faTwo = fxyApplyService.findByUserId(fxyTwoUser.getUserId());
if(faTwo.getStatus().equals(1)){
if(fxyTwoUser!=null && fxyTwoUser.getBlIsFxy() !=null && fxyTwoUser.getBlIsFxy() ==1){
isCanFxyFy = false;
if(fc.getFxmLimit().equals(2)){
int fxmLimitDays = fc.getFxmLimitDays();
String approveTime = faTwo.getApproveTime();
Date approveDate = DateUtils.stringToDate(approveTime,DateUtils.DATE_TIME_PATTERN);
Calendar calendar = Calendar.getInstance();
calendar.setTime(approveDate);
calendar.add(Calendar.DAY_OF_MONTH, fxmLimitDays);
approveDate = calendar.getTime();
Date current = new Date();
if(approveDate.getTime() > current.getTime()){
isCanFxyFy = true;
}
}else{
isCanFxyFy = true;
}
if(isCanFxyFy) {
orders.setFxyTwoUserId(fxyTwoUser.getUserId());
orders.setFxyTwoUserName(fxyTwoUser.getUserName());
BigDecimal twoRate = fc.getTwoRate();
BigDecimal twoRecommendRate = fc.getTwoRecommendRate();
fxyRate = BigDecimal.ZERO;
if (twoRate == null || twoRate.compareTo(BigDecimal.ZERO) == 0) {
fxyRate = twoRecommendRate;
if (twoRecommendRate.compareTo(mostRate) > 0) {
fxyRate = mostRate;
}
} else {
fxyRate = twoRate;
if (twoRate.compareTo(mostRate) > 0) {
fxyRate = mostRate;
}
}
BigDecimal fxyTwoMoney = fxyMoney.multiply(fxyRate).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
orders.setFxyTwoMoney(fxyTwoMoney);
BigDecimal fxyTwoArtificerDeductMoney = fxyTwoMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
orders.setFxyTwoArtificerDeductMoney(fxyTwoArtificerDeductMoney);
}
}
}
}else{
orders.setFxyTwoMoney(BigDecimal.ZERO);
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
}
}
}
}
}else{
orders.setFxyOneMoney(BigDecimal.ZERO);
orders.setFxyOneArtificerDeductMoney(BigDecimal.ZERO);
orders.setFxyTwoMoney(BigDecimal.ZERO);
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
}
orders.setOneUserMoney(oneUserMoney);
// artificerPrice = artificerPrice.subtract(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney);
artificerPrice = artificerPrice.subtract(shopMoney);
artificerPrice = artificerPrice.subtract(oneUserMoney);
// artificerPrice = artificerPrice.subtract(oneUserMoney);
artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担
artificerPrice = artificerPrice.subtract(orders.getFxyTwoArtificerDeductMoney());//减掉二级分销商分佣技师承担
if(orders.getIsSupplement()!=null && orders.getIsSupplement().equals(2)){
}else{
//用户收益加上通行费用
@ -1648,7 +1897,9 @@ public class AliPayController {
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney);
pingMoney = pingMoney.subtract(oneUserMoney);
// pingMoney = pingMoney.subtract(oneUserMoney);
pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣
pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣
orders.setPingMoney(pingMoney);
ordersService.updateById(orders);
@ -1680,9 +1931,17 @@ public class AliPayController {
if(orders1.getAddMoney()!=null){
orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney()));
orders1.setAddArtificerMoney(orders1.getAddArtificerMoney().add(orders.getArtificerMoney()));
orders1.setAddProjectBenefits(orders1.getProjectBenefits().add(orders.getProjectBenefits()));
orders1.setAddPriceMarkup(orders1.getAddPriceMarkup().add(orders.getPriceMarkup()));
orders1.setAddTechnicianMoney(orders1.getAddTechnicianMoney().add(orders.getTechnicianMoney()));
orders1.setAddVipReductionMoney(orders1.getAddVipReductionMoney().add(orders.getVipReductionMoney()));
}else{
orders1.setAddMoney(orders.getPayMoney());
orders1.setAddArtificerMoney(orders.getArtificerMoney());
orders1.setAddProjectBenefits(orders.getProjectBenefits());
orders1.setAddPriceMarkup(orders.getPriceMarkup());
orders1.setAddTechnicianMoney(orders.getTechnicianMoney());
orders1.setAddVipReductionMoney(orders.getVipReductionMoney());
}
orders1.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney()));
orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney()));
@ -1690,7 +1949,11 @@ public class AliPayController {
// orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney()));
orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney()));
orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney()));
orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney()));
// orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney()));
orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney()));
orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney()));
orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney()));
orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney()));
orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney()));
if(orders1.getStatus().equals(6)){
@ -2055,20 +2318,136 @@ public class AliPayController {
}
}
orders.setShopMoney(shopMoney);
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
BigDecimal oneUserMoney = BigDecimal.ZERO;
if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
orders.setOneUserId(oneUser.getUserId());
orders.setOneUserName(oneUser.getUserName());
oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
oneUserMoney = oneUserMoney.setScale(2, BigDecimal.ROUND_HALF_UP);
// UserEntity user = userService.selectUserById(orders.getUserId());
// UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
// BigDecimal oneUserMoney = BigDecimal.ZERO;
// if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
// orders.setOneUserId(oneUser.getUserId());
// orders.setOneUserName(oneUser.getUserName());
// oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
// oneUserMoney = oneUserMoney.setScale(2, BigDecimal.ROUND_HALF_UP);
// }
// orders.setOneUserMoney(oneUserMoney);
//分销商分佣
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
if(fc.getIsOpen().equals(1)){
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
if(faOne.getStatus().equals(1)){
if(fxyOneUser!=null && fxyOneUser.getBlIsFxy() !=null && fxyOneUser.getBlIsFxy() ==1){
boolean isCanFxyFy = false;
if(fc.getFxmLimit().equals(2)){
int fxmLimitDays = fc.getFxmLimitDays();
String approveTime = faOne.getApproveTime();
Date approveDate = DateUtils.stringToDate(approveTime,DateUtils.DATE_TIME_PATTERN);
Calendar calendar = Calendar.getInstance();
calendar.setTime(approveDate);
calendar.add(Calendar.DAY_OF_MONTH, fxmLimitDays);
approveDate = calendar.getTime();
Date current = new Date();
if(approveDate.getTime() > current.getTime()){
isCanFxyFy = true;
}
}else{
isCanFxyFy = true;
}
if(isCanFxyFy){
orders.setFxyOneUserId(fxyOneUser.getUserId());
orders.setFxyOneUserName(fxyOneUser.getUserName());
BigDecimal fxyMoney = BigDecimal.ZERO;
if(fc.getType().equals(1)){
fxyMoney = artificerPrice;
}
if(fc.getType().equals(2)){
fxyMoney = subtract;
}
BigDecimal artificerRate = fc.getArtificerRate();
BigDecimal mostRate = fc.getMostRate();
BigDecimal oneRate = fc.getOneRate();
BigDecimal oneRecommendRate = fc.getOneRecommendRate();
BigDecimal fxyRate = BigDecimal.ZERO;
if(oneRate == null || oneRate.compareTo(BigDecimal.ZERO) == 0){
fxyRate = oneRecommendRate;
if(oneRecommendRate.compareTo(mostRate)> 0){
fxyRate = mostRate;
}
}else{
fxyRate = oneRate;
if(oneRate.compareTo(mostRate)> 0){
fxyRate = mostRate;
}
}
BigDecimal fxyOneMoney = fxyMoney.multiply(fxyRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setFxyOneMoney(fxyOneMoney);
BigDecimal fxyOneArtificerDeductMoney = fxyOneMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setFxyOneArtificerDeductMoney(fxyOneArtificerDeductMoney);
if(fxyOneUser.getBlFxyLevel().equals(1)){
UserEntity fxyTwoUser = userService.queryByInvitationCode(fxyOneUser.getBlFxyCode());
FxyApply faTwo = fxyApplyService.findByUserId(fxyTwoUser.getUserId());
if(faTwo.getStatus().equals(1)){
if(fxyTwoUser!=null && fxyTwoUser.getBlIsFxy() !=null && fxyTwoUser.getBlIsFxy() ==1){
isCanFxyFy = false;
if(fc.getFxmLimit().equals(2)){
int fxmLimitDays = fc.getFxmLimitDays();
String approveTime = faTwo.getApproveTime();
Date approveDate = DateUtils.stringToDate(approveTime,DateUtils.DATE_TIME_PATTERN);
Calendar calendar = Calendar.getInstance();
calendar.setTime(approveDate);
calendar.add(Calendar.DAY_OF_MONTH, fxmLimitDays);
approveDate = calendar.getTime();
Date current = new Date();
if(approveDate.getTime() > current.getTime()){
isCanFxyFy = true;
}
}else{
isCanFxyFy = true;
}
if(isCanFxyFy) {
orders.setFxyTwoUserId(fxyTwoUser.getUserId());
orders.setFxyTwoUserName(fxyTwoUser.getUserName());
BigDecimal twoRate = fc.getTwoRate();
BigDecimal twoRecommendRate = fc.getTwoRecommendRate();
fxyRate = BigDecimal.ZERO;
if (twoRate == null || twoRate.compareTo(BigDecimal.ZERO) == 0) {
fxyRate = twoRecommendRate;
if (twoRecommendRate.compareTo(mostRate) > 0) {
fxyRate = mostRate;
}
} else {
fxyRate = twoRate;
if (twoRate.compareTo(mostRate) > 0) {
fxyRate = mostRate;
}
}
BigDecimal fxyTwoMoney = fxyMoney.multiply(fxyRate).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
orders.setFxyTwoMoney(fxyTwoMoney);
BigDecimal fxyTwoArtificerDeductMoney = fxyTwoMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
orders.setFxyTwoArtificerDeductMoney(fxyTwoArtificerDeductMoney);
}
}
}
}else{
orders.setFxyTwoMoney(BigDecimal.ZERO);
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
}
}
}
}
}else{
orders.setFxyOneMoney(BigDecimal.ZERO);
orders.setFxyOneArtificerDeductMoney(BigDecimal.ZERO);
orders.setFxyTwoMoney(BigDecimal.ZERO);
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
}
orders.setOneUserMoney(oneUserMoney);
// artificerPrice = artificerPrice.subtract(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney);
artificerPrice = artificerPrice.subtract(shopMoney);
artificerPrice = artificerPrice.subtract(oneUserMoney);
// artificerPrice = artificerPrice.subtract(oneUserMoney);
artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担
artificerPrice = artificerPrice.subtract(orders.getFxyTwoArtificerDeductMoney());//减掉二级分销商分佣技师承担
if(orders.getIsSupplement()!=null && orders.getIsSupplement().equals(2)){
}else{
//用户收益加上通行费用
@ -2083,7 +2462,9 @@ public class AliPayController {
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney);
pingMoney = pingMoney.subtract(oneUserMoney);
// pingMoney = pingMoney.subtract(oneUserMoney);
pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣
pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣
orders.setPingMoney(pingMoney);
ordersService.updateById(orders);
@ -2157,9 +2538,17 @@ public class AliPayController {
if(orders1.getAddMoney()!=null){
orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney()));
orders1.setAddArtificerMoney(orders1.getAddArtificerMoney().add(orders.getArtificerMoney()));
orders1.setAddProjectBenefits(orders1.getProjectBenefits().add(orders.getProjectBenefits()));
orders1.setAddPriceMarkup(orders1.getAddPriceMarkup().add(orders.getPriceMarkup()));
orders1.setAddTechnicianMoney(orders1.getAddTechnicianMoney().add(orders.getTechnicianMoney()));
orders1.setAddVipReductionMoney(orders1.getAddVipReductionMoney().add(orders.getVipReductionMoney()));
}else{
orders1.setAddMoney(orders.getPayMoney());
orders1.setAddArtificerMoney(orders.getArtificerMoney());
orders1.setAddProjectBenefits(orders.getProjectBenefits());
orders1.setAddPriceMarkup(orders.getPriceMarkup());
orders1.setAddTechnicianMoney(orders.getTechnicianMoney());
orders1.setAddVipReductionMoney(orders.getVipReductionMoney());
}
orders1.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney()));
orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney()));
@ -2167,7 +2556,11 @@ public class AliPayController {
// orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney()));
orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney()));
orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney()));
orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney()));
// orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney()));
orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney()));
orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney()));
orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney()));
orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney()));
orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney()));
if(orders1.getStatus().equals(6)){

466
src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java
View File

@ -19,7 +19,9 @@ import com.sqx.modules.artificer.dao.UserRechargeDao;
import com.sqx.modules.artificer.entity.*;
import com.sqx.modules.artificer.service.*;
import com.sqx.modules.bl.commission.fxy.entity.FxyApply;
import com.sqx.modules.bl.commission.fxy.entity.FxyConfig;
import com.sqx.modules.bl.commission.fxy.service.FxyApplyService;
import com.sqx.modules.bl.commission.fxy.service.FxyConfigService;
import com.sqx.modules.bl.massage.entity.MassagePackage;
import com.sqx.modules.bl.massage.service.MassagePackageService;
import com.sqx.modules.bl.order.dao.UserPackageOrderDao;
@ -145,6 +147,8 @@ public class WxServiceImpl implements WxService {
private BlSadJobService blSadJobService;
@Autowired
private FxyApplyService fxyApplyService;
@Autowired
private FxyConfigService fxyConfigService;
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -915,20 +919,136 @@ public class WxServiceImpl implements WxService {
}
}
orders.setShopMoney(shopMoney);
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
BigDecimal oneUserMoney = BigDecimal.ZERO;
if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
orders.setOneUserId(oneUser.getUserId());
orders.setOneUserName(oneUser.getUserName());
oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
oneUserMoney = oneUserMoney.setScale(2, BigDecimal.ROUND_HALF_UP);
// UserEntity user = userService.selectUserById(orders.getUserId());
// UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
// BigDecimal oneUserMoney = BigDecimal.ZERO;
// if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
// orders.setOneUserId(oneUser.getUserId());
// orders.setOneUserName(oneUser.getUserName());
// oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
// oneUserMoney = oneUserMoney.setScale(2, BigDecimal.ROUND_HALF_UP);
// }
// orders.setOneUserMoney(oneUserMoney);
//分销商分佣
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
if(fc.getIsOpen().equals(1)){
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
if(faOne.getStatus().equals(1)){
if(fxyOneUser!=null && fxyOneUser.getBlIsFxy() !=null && fxyOneUser.getBlIsFxy() ==1){
boolean isCanFxyFy = false;
if(fc.getFxmLimit().equals(2)){
int fxmLimitDays = fc.getFxmLimitDays();
String approveTime = faOne.getApproveTime();
Date approveDate = DateUtils.stringToDate(approveTime,DateUtils.DATE_TIME_PATTERN);
Calendar calendar = Calendar.getInstance();
calendar.setTime(approveDate);
calendar.add(Calendar.DAY_OF_MONTH, fxmLimitDays);
approveDate = calendar.getTime();
Date current = new Date();
if(approveDate.getTime() > current.getTime()){
isCanFxyFy = true;
}
}else{
isCanFxyFy = true;
}
if(isCanFxyFy){
orders.setFxyOneUserId(fxyOneUser.getUserId());
orders.setFxyOneUserName(fxyOneUser.getUserName());
BigDecimal fxyMoney = BigDecimal.ZERO;
if(fc.getType().equals(1)){
fxyMoney = artificerPrice;
}
if(fc.getType().equals(2)){
fxyMoney = subtract;
}
BigDecimal artificerRate = fc.getArtificerRate();
BigDecimal mostRate = fc.getMostRate();
BigDecimal oneRate = fc.getOneRate();
BigDecimal oneRecommendRate = fc.getOneRecommendRate();
BigDecimal fxyRate = BigDecimal.ZERO;
if(oneRate == null || oneRate.compareTo(BigDecimal.ZERO) == 0){
fxyRate = oneRecommendRate;
if(oneRecommendRate.compareTo(mostRate)> 0){
fxyRate = mostRate;
}
}else{
fxyRate = oneRate;
if(oneRate.compareTo(mostRate)> 0){
fxyRate = mostRate;
}
}
BigDecimal fxyOneMoney = fxyMoney.multiply(fxyRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setFxyOneMoney(fxyOneMoney);
BigDecimal fxyOneArtificerDeductMoney = fxyOneMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setFxyOneArtificerDeductMoney(fxyOneArtificerDeductMoney);
if(fxyOneUser.getBlFxyLevel().equals(1)){
UserEntity fxyTwoUser = userService.queryByInvitationCode(fxyOneUser.getBlFxyCode());
FxyApply faTwo = fxyApplyService.findByUserId(fxyTwoUser.getUserId());
if(faTwo.getStatus().equals(1)){
if(fxyTwoUser!=null && fxyTwoUser.getBlIsFxy() !=null && fxyTwoUser.getBlIsFxy() ==1){
isCanFxyFy = false;
if(fc.getFxmLimit().equals(2)){
int fxmLimitDays = fc.getFxmLimitDays();
String approveTime = faTwo.getApproveTime();
Date approveDate = DateUtils.stringToDate(approveTime,DateUtils.DATE_TIME_PATTERN);
Calendar calendar = Calendar.getInstance();
calendar.setTime(approveDate);
calendar.add(Calendar.DAY_OF_MONTH, fxmLimitDays);
approveDate = calendar.getTime();
Date current = new Date();
if(approveDate.getTime() > current.getTime()){
isCanFxyFy = true;
}
}else{
isCanFxyFy = true;
}
if(isCanFxyFy) {
orders.setFxyTwoUserId(fxyTwoUser.getUserId());
orders.setFxyTwoUserName(fxyTwoUser.getUserName());
BigDecimal twoRate = fc.getTwoRate();
BigDecimal twoRecommendRate = fc.getTwoRecommendRate();
fxyRate = BigDecimal.ZERO;
if (twoRate == null || twoRate.compareTo(BigDecimal.ZERO) == 0) {
fxyRate = twoRecommendRate;
if (twoRecommendRate.compareTo(mostRate) > 0) {
fxyRate = mostRate;
}
} else {
fxyRate = twoRate;
if (twoRate.compareTo(mostRate) > 0) {
fxyRate = mostRate;
}
}
BigDecimal fxyTwoMoney = fxyMoney.multiply(fxyRate).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
orders.setFxyTwoMoney(fxyTwoMoney);
BigDecimal fxyTwoArtificerDeductMoney = fxyTwoMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
orders.setFxyTwoArtificerDeductMoney(fxyTwoArtificerDeductMoney);
}
}
}
}else{
orders.setFxyTwoMoney(BigDecimal.ZERO);
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
}
}
}
}
}else{
orders.setFxyOneMoney(BigDecimal.ZERO);
orders.setFxyOneArtificerDeductMoney(BigDecimal.ZERO);
orders.setFxyTwoMoney(BigDecimal.ZERO);
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
}
orders.setOneUserMoney(oneUserMoney);
// artificerPrice = artificerPrice.subtract(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney);
artificerPrice = artificerPrice.subtract(shopMoney);
artificerPrice = artificerPrice.subtract(oneUserMoney);
// artificerPrice = artificerPrice.subtract(oneUserMoney);
artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担
artificerPrice = artificerPrice.subtract(orders.getFxyTwoArtificerDeductMoney());//减掉二级分销商分佣技师承担
if(orders.getIsSupplement()!=null && orders.getIsSupplement().equals(2)){
}else{
//用户收益加上通行费用
@ -943,7 +1063,9 @@ public class WxServiceImpl implements WxService {
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney);
pingMoney = pingMoney.subtract(oneUserMoney);
// pingMoney = pingMoney.subtract(oneUserMoney);
pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣
pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣
orders.setPingMoney(pingMoney);
ordersService.updateById(orders);
@ -975,9 +1097,17 @@ public class WxServiceImpl implements WxService {
if(orders1.getAddMoney()!=null){
orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney()));
orders1.setAddArtificerMoney(orders1.getAddArtificerMoney().add(orders.getArtificerMoney()));
orders1.setAddProjectBenefits(orders1.getProjectBenefits().add(orders.getProjectBenefits()));
orders1.setAddPriceMarkup(orders1.getAddPriceMarkup().add(orders.getPriceMarkup()));
orders1.setAddTechnicianMoney(orders1.getAddTechnicianMoney().add(orders.getTechnicianMoney()));
orders1.setAddVipReductionMoney(orders1.getAddVipReductionMoney().add(orders.getVipReductionMoney()));
}else{
orders1.setAddMoney(orders.getPayMoney());
orders1.setAddArtificerMoney(orders.getArtificerMoney());
orders1.setAddProjectBenefits(orders.getProjectBenefits());
orders1.setAddPriceMarkup(orders.getPriceMarkup());
orders1.setAddTechnicianMoney(orders.getTechnicianMoney());
orders1.setAddVipReductionMoney(orders.getVipReductionMoney());
}
orders1.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney()));
orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney()));
@ -985,7 +1115,11 @@ public class WxServiceImpl implements WxService {
// orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney()));
orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney()));
orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney()));
orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney()));
// orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney()));
orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney()));
orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney()));
orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney()));
orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney()));
orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney()));
if(orders1.getStatus().equals(6)){
@ -1551,20 +1685,136 @@ public class WxServiceImpl implements WxService {
}
}
orders.setShopMoney(shopMoney);
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
BigDecimal oneUserMoney = BigDecimal.ZERO;
if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
orders.setOneUserId(oneUser.getUserId());
orders.setOneUserName(oneUser.getUserName());
oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
oneUserMoney = oneUserMoney.setScale(0, BigDecimal.ROUND_HALF_UP);
// UserEntity user = userService.selectUserById(orders.getUserId());
// UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
// BigDecimal oneUserMoney = BigDecimal.ZERO;
// if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
// orders.setOneUserId(oneUser.getUserId());
// orders.setOneUserName(oneUser.getUserName());
// oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
// oneUserMoney = oneUserMoney.setScale(0, BigDecimal.ROUND_HALF_UP);
// }
// orders.setOneUserMoney(oneUserMoney);
//分销商分佣
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
if(fc.getIsOpen().equals(1)){
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
if(faOne.getStatus().equals(1)){
if(fxyOneUser!=null && fxyOneUser.getBlIsFxy() !=null && fxyOneUser.getBlIsFxy() ==1){
boolean isCanFxyFy = false;
if(fc.getFxmLimit().equals(2)){
int fxmLimitDays = fc.getFxmLimitDays();
String approveTime = faOne.getApproveTime();
Date approveDate = DateUtils.stringToDate(approveTime,DateUtils.DATE_TIME_PATTERN);
Calendar calendar = Calendar.getInstance();
calendar.setTime(approveDate);
calendar.add(Calendar.DAY_OF_MONTH, fxmLimitDays);
approveDate = calendar.getTime();
Date current = new Date();
if(approveDate.getTime() > current.getTime()){
isCanFxyFy = true;
}
}else{
isCanFxyFy = true;
}
if(isCanFxyFy){
orders.setFxyOneUserId(fxyOneUser.getUserId());
orders.setFxyOneUserName(fxyOneUser.getUserName());
BigDecimal fxyMoney = BigDecimal.ZERO;
if(fc.getType().equals(1)){
fxyMoney = artificerPrice;
}
if(fc.getType().equals(2)){
fxyMoney = subtract;
}
BigDecimal artificerRate = fc.getArtificerRate();
BigDecimal mostRate = fc.getMostRate();
BigDecimal oneRate = fc.getOneRate();
BigDecimal oneRecommendRate = fc.getOneRecommendRate();
BigDecimal fxyRate = BigDecimal.ZERO;
if(oneRate == null || oneRate.compareTo(BigDecimal.ZERO) == 0){
fxyRate = oneRecommendRate;
if(oneRecommendRate.compareTo(mostRate)> 0){
fxyRate = mostRate;
}
}else{
fxyRate = oneRate;
if(oneRate.compareTo(mostRate)> 0){
fxyRate = mostRate;
}
}
BigDecimal fxyOneMoney = fxyMoney.multiply(fxyRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setFxyOneMoney(fxyOneMoney);
BigDecimal fxyOneArtificerDeductMoney = fxyOneMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setFxyOneArtificerDeductMoney(fxyOneArtificerDeductMoney);
if(fxyOneUser.getBlFxyLevel().equals(1)){
UserEntity fxyTwoUser = userService.queryByInvitationCode(fxyOneUser.getBlFxyCode());
FxyApply faTwo = fxyApplyService.findByUserId(fxyTwoUser.getUserId());
if(faTwo.getStatus().equals(1)){
if(fxyTwoUser!=null && fxyTwoUser.getBlIsFxy() !=null && fxyTwoUser.getBlIsFxy() ==1){
isCanFxyFy = false;
if(fc.getFxmLimit().equals(2)){
int fxmLimitDays = fc.getFxmLimitDays();
String approveTime = faTwo.getApproveTime();
Date approveDate = DateUtils.stringToDate(approveTime,DateUtils.DATE_TIME_PATTERN);
Calendar calendar = Calendar.getInstance();
calendar.setTime(approveDate);
calendar.add(Calendar.DAY_OF_MONTH, fxmLimitDays);
approveDate = calendar.getTime();
Date current = new Date();
if(approveDate.getTime() > current.getTime()){
isCanFxyFy = true;
}
}else{
isCanFxyFy = true;
}
if(isCanFxyFy) {
orders.setFxyTwoUserId(fxyTwoUser.getUserId());
orders.setFxyTwoUserName(fxyTwoUser.getUserName());
BigDecimal twoRate = fc.getTwoRate();
BigDecimal twoRecommendRate = fc.getTwoRecommendRate();
fxyRate = BigDecimal.ZERO;
if (twoRate == null || twoRate.compareTo(BigDecimal.ZERO) == 0) {
fxyRate = twoRecommendRate;
if (twoRecommendRate.compareTo(mostRate) > 0) {
fxyRate = mostRate;
}
} else {
fxyRate = twoRate;
if (twoRate.compareTo(mostRate) > 0) {
fxyRate = mostRate;
}
}
BigDecimal fxyTwoMoney = fxyMoney.multiply(fxyRate).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
orders.setFxyTwoMoney(fxyTwoMoney);
BigDecimal fxyTwoArtificerDeductMoney = fxyTwoMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
orders.setFxyTwoArtificerDeductMoney(fxyTwoArtificerDeductMoney);
}
}
}
}else{
orders.setFxyTwoMoney(BigDecimal.ZERO);
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
}
}
}
}
}else{
orders.setFxyOneMoney(BigDecimal.ZERO);
orders.setFxyOneArtificerDeductMoney(BigDecimal.ZERO);
orders.setFxyTwoMoney(BigDecimal.ZERO);
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
}
orders.setOneUserMoney(oneUserMoney);
// artificerPrice = artificerPrice.subtract(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney);
artificerPrice = artificerPrice.subtract(shopMoney);
artificerPrice = artificerPrice.subtract(oneUserMoney);
// artificerPrice = artificerPrice.subtract(oneUserMoney);
artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担
artificerPrice = artificerPrice.subtract(orders.getFxyTwoArtificerDeductMoney());//减掉二级分销商分佣技师承担
if(orders.getIsSupplement()!=null && orders.getIsSupplement().equals(2)){
}else{
//用户收益加上通行费用
@ -1579,7 +1829,9 @@ public class WxServiceImpl implements WxService {
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney);
pingMoney = pingMoney.subtract(oneUserMoney);
// pingMoney = pingMoney.subtract(oneUserMoney);
pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣
pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣
orders.setPingMoney(pingMoney);
ordersService.updateById(orders);
@ -1647,9 +1899,17 @@ public class WxServiceImpl implements WxService {
if(orders1.getAddMoney()!=null){
orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney()));
orders1.setAddArtificerMoney(orders1.getAddArtificerMoney().add(orders.getArtificerMoney()));
orders1.setAddProjectBenefits(orders1.getProjectBenefits().add(orders.getProjectBenefits()));
orders1.setAddPriceMarkup(orders1.getAddPriceMarkup().add(orders.getPriceMarkup()));
orders1.setAddTechnicianMoney(orders1.getAddTechnicianMoney().add(orders.getTechnicianMoney()));
orders1.setAddVipReductionMoney(orders1.getAddVipReductionMoney().add(orders.getVipReductionMoney()));
}else{
orders1.setAddMoney(orders.getPayMoney());
orders1.setAddArtificerMoney(orders.getArtificerMoney());
orders1.setAddProjectBenefits(orders.getProjectBenefits());
orders1.setAddPriceMarkup(orders.getPriceMarkup());
orders1.setAddTechnicianMoney(orders.getTechnicianMoney());
orders1.setAddVipReductionMoney(orders.getVipReductionMoney());
}
orders1.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney()));
orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney()));
@ -1657,7 +1917,11 @@ public class WxServiceImpl implements WxService {
// orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney()));
orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney()));
orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney()));
orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney()));
// orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney()));
orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney()));
orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney()));
orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney()));
orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney()));
orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney()));
if(orders1.getStatus().equals(6)){
@ -2406,20 +2670,136 @@ public class WxServiceImpl implements WxService {
}
}
orders.setShopMoney(shopMoney);
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
BigDecimal oneUserMoney = BigDecimal.ZERO;
if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
orders.setOneUserId(oneUser.getUserId());
orders.setOneUserName(oneUser.getUserName());
oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
oneUserMoney = oneUserMoney.setScale(0, BigDecimal.ROUND_HALF_UP);
// UserEntity user = userService.selectUserById(orders.getUserId());
// UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
// BigDecimal oneUserMoney = BigDecimal.ZERO;
// if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
// orders.setOneUserId(oneUser.getUserId());
// orders.setOneUserName(oneUser.getUserName());
// oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
// oneUserMoney = oneUserMoney.setScale(0, BigDecimal.ROUND_HALF_UP);
// }
// orders.setOneUserMoney(oneUserMoney);
//分销商分佣
FxyConfig fc = fxyConfigService.getOne(new QueryWrapper<FxyConfig>());
if(fc.getIsOpen().equals(1)){
UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity fxyOneUser = userService.queryByInvitationCode(user.getBlFxyCode());
FxyApply faOne = fxyApplyService.findByUserId(fxyOneUser.getUserId());
if(faOne.getStatus().equals(1)){
if(fxyOneUser!=null && fxyOneUser.getBlIsFxy() !=null && fxyOneUser.getBlIsFxy() ==1){
boolean isCanFxyFy = false;
if(fc.getFxmLimit().equals(2)){
int fxmLimitDays = fc.getFxmLimitDays();
String approveTime = faOne.getApproveTime();
Date approveDate = DateUtils.stringToDate(approveTime,DateUtils.DATE_TIME_PATTERN);
Calendar calendar = Calendar.getInstance();
calendar.setTime(approveDate);
calendar.add(Calendar.DAY_OF_MONTH, fxmLimitDays);
approveDate = calendar.getTime();
Date current = new Date();
if(approveDate.getTime() > current.getTime()){
isCanFxyFy = true;
}
}else{
isCanFxyFy = true;
}
if(isCanFxyFy){
orders.setFxyOneUserId(fxyOneUser.getUserId());
orders.setFxyOneUserName(fxyOneUser.getUserName());
BigDecimal fxyMoney = BigDecimal.ZERO;
if(fc.getType().equals(1)){
fxyMoney = artificerPrice;
}
if(fc.getType().equals(2)){
fxyMoney = subtract;
}
BigDecimal artificerRate = fc.getArtificerRate();
BigDecimal mostRate = fc.getMostRate();
BigDecimal oneRate = fc.getOneRate();
BigDecimal oneRecommendRate = fc.getOneRecommendRate();
BigDecimal fxyRate = BigDecimal.ZERO;
if(oneRate == null || oneRate.compareTo(BigDecimal.ZERO) == 0){
fxyRate = oneRecommendRate;
if(oneRecommendRate.compareTo(mostRate)> 0){
fxyRate = mostRate;
}
}else{
fxyRate = oneRate;
if(oneRate.compareTo(mostRate)> 0){
fxyRate = mostRate;
}
}
BigDecimal fxyOneMoney = fxyMoney.multiply(fxyRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setFxyOneMoney(fxyOneMoney);
BigDecimal fxyOneArtificerDeductMoney = fxyOneMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
orders.setFxyOneArtificerDeductMoney(fxyOneArtificerDeductMoney);
if(fxyOneUser.getBlFxyLevel().equals(1)){
UserEntity fxyTwoUser = userService.queryByInvitationCode(fxyOneUser.getBlFxyCode());
FxyApply faTwo = fxyApplyService.findByUserId(fxyTwoUser.getUserId());
if(faTwo.getStatus().equals(1)){
if(fxyTwoUser!=null && fxyTwoUser.getBlIsFxy() !=null && fxyTwoUser.getBlIsFxy() ==1){
isCanFxyFy = false;
if(fc.getFxmLimit().equals(2)){
int fxmLimitDays = fc.getFxmLimitDays();
String approveTime = faTwo.getApproveTime();
Date approveDate = DateUtils.stringToDate(approveTime,DateUtils.DATE_TIME_PATTERN);
Calendar calendar = Calendar.getInstance();
calendar.setTime(approveDate);
calendar.add(Calendar.DAY_OF_MONTH, fxmLimitDays);
approveDate = calendar.getTime();
Date current = new Date();
if(approveDate.getTime() > current.getTime()){
isCanFxyFy = true;
}
}else{
isCanFxyFy = true;
}
if(isCanFxyFy) {
orders.setFxyTwoUserId(fxyTwoUser.getUserId());
orders.setFxyTwoUserName(fxyTwoUser.getUserName());
BigDecimal twoRate = fc.getTwoRate();
BigDecimal twoRecommendRate = fc.getTwoRecommendRate();
fxyRate = BigDecimal.ZERO;
if (twoRate == null || twoRate.compareTo(BigDecimal.ZERO) == 0) {
fxyRate = twoRecommendRate;
if (twoRecommendRate.compareTo(mostRate) > 0) {
fxyRate = mostRate;
}
} else {
fxyRate = twoRate;
if (twoRate.compareTo(mostRate) > 0) {
fxyRate = mostRate;
}
}
BigDecimal fxyTwoMoney = fxyMoney.multiply(fxyRate).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
orders.setFxyTwoMoney(fxyTwoMoney);
BigDecimal fxyTwoArtificerDeductMoney = fxyTwoMoney.multiply(artificerRate).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
orders.setFxyTwoArtificerDeductMoney(fxyTwoArtificerDeductMoney);
}
}
}
}else{
orders.setFxyTwoMoney(BigDecimal.ZERO);
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
}
}
}
}
}else{
orders.setFxyOneMoney(BigDecimal.ZERO);
orders.setFxyOneArtificerDeductMoney(BigDecimal.ZERO);
orders.setFxyTwoMoney(BigDecimal.ZERO);
orders.setFxyTwoArtificerDeductMoney(BigDecimal.ZERO);
}
orders.setOneUserMoney(oneUserMoney);
// artificerPrice = artificerPrice.subtract(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney);
artificerPrice = artificerPrice.subtract(shopMoney);
artificerPrice = artificerPrice.subtract(oneUserMoney);
// artificerPrice = artificerPrice.subtract(oneUserMoney);
artificerPrice = artificerPrice.subtract(orders.getFxyOneArtificerDeductMoney());//减掉一级分销商分佣技师承担
artificerPrice = artificerPrice.subtract(orders.getFxyTwoArtificerDeductMoney());//减掉二级分销商分佣技师承担
if(orders.getIsSupplement()!=null && orders.getIsSupplement().equals(2)){
}else{
//用户收益加上通行费用
@ -2434,7 +2814,9 @@ public class WxServiceImpl implements WxService {
pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney);
pingMoney = pingMoney.subtract(oneUserMoney);
// pingMoney = pingMoney.subtract(oneUserMoney);
pingMoney = pingMoney.subtract(orders.getFxyOneMoney());//减掉一级分销商分佣
pingMoney = pingMoney.subtract(orders.getFxyTwoMoney());//减掉二级分销商分佣
orders.setPingMoney(pingMoney);
ordersService.updateById(orders);
@ -2502,9 +2884,17 @@ public class WxServiceImpl implements WxService {
if(orders1.getAddMoney()!=null){
orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney()));
orders1.setAddArtificerMoney(orders1.getAddArtificerMoney().add(orders.getArtificerMoney()));
orders1.setAddProjectBenefits(orders1.getProjectBenefits().add(orders.getProjectBenefits()));
orders1.setAddPriceMarkup(orders1.getAddPriceMarkup().add(orders.getPriceMarkup()));
orders1.setAddTechnicianMoney(orders1.getAddTechnicianMoney().add(orders.getTechnicianMoney()));
orders1.setAddVipReductionMoney(orders1.getAddVipReductionMoney().add(orders.getVipReductionMoney()));
}else{
orders1.setAddMoney(orders.getPayMoney());
orders1.setAddArtificerMoney(orders.getArtificerMoney());
orders1.setAddProjectBenefits(orders.getProjectBenefits());
orders1.setAddPriceMarkup(orders.getPriceMarkup());
orders1.setAddTechnicianMoney(orders.getTechnicianMoney());
orders1.setAddVipReductionMoney(orders.getVipReductionMoney());
}
orders1.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney()));
orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney()));
@ -2512,7 +2902,11 @@ public class WxServiceImpl implements WxService {
// orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney()));
orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney()));
orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney()));
orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney()));
// orders1.setOneUserMoney(orders1.getOneUserMoney().add(orders.getOneUserMoney()));
orders1.setFxyOneMoney(orders1.getFxyOneMoney().add(orders.getFxyOneMoney()));
orders1.setFxyTwoMoney(orders1.getFxyTwoMoney().add(orders.getFxyTwoMoney()));
orders1.setFxyOneArtificerDeductMoney(orders1.getFxyOneArtificerDeductMoney().add(orders.getFxyOneArtificerDeductMoney()));
orders1.setFxyTwoArtificerDeductMoney(orders1.getFxyTwoArtificerDeductMoney().add(orders.getFxyTwoArtificerDeductMoney()));
orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney()));
if(orders1.getStatus().equals(6)){

6
src/main/resources/mapper/bl/commission/jjr/JjrApplyDao.xml
View File

@ -79,10 +79,4 @@
order by b.user_id
</select>
<update id="setRate" parameterType="com.sqx.modules.bl.commission.jjr.entity.JjrApply">
update tb_user
set bl_jjr_rate=#{rate}
where user_id=#{userId}
</update>
</mapper>

26
src/main/resources/mapper/bl/commission/jjr/JjrConfigLevelDao.xml Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sqx.modules.bl.commission.jjr.dao.JjrConfigLevelDao">
<select id="findList" resultType="com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel">
select id,level,min_number,max_number,rate,create_time,concat(min_number,'至',max_number,'人') as peopleNumber
from bl_jjr_config_level
order by id desc
</select>
<insert id="add" useGeneratedKeys="true" keyProperty="id" parameterType="com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel">
insert into bl_jjr_config_level(level,min_number,max_number,rate,create_time)
values(#{level},#{minNumber},#{maxNumber},#{rate},#{createTime})
</insert>
<update id="update" parameterType="com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel">
update bl_jjr_config_level
set level=#{level},
min_number=#{minNumber},
max_number=#{maxNumber},
rate=#{rate}
where id=#{id}
</update>
</mapper>