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

分销员

This commit is contained in:
曹磊 2024-08-07 22:00:54 +08:00
parent 00ff45b49d
commit c815dd365e
5 changed files with 1974 additions and 186 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) @TableField(exist = false)
private String zxsc; private String zxsc;
/**
* 经纪人分佣
*/
private BigDecimal jjrMoney;
/** /**
* 经纪人ID * 经纪人ID
*/ */
@ -621,9 +617,13 @@ public class Orders implements Serializable {
*/ */
private String jjrUserName; private String jjrUserName;
/** /**
* 一级分销员分佣 * 经纪人分佣
*/ */
private BigDecimal fxyOneMoney; private BigDecimal jjrMoney;
/**
* 经纪人分佣技师承担金额
*/
private BigDecimal jjrArtificerDeductMoney;
/** /**
* 一级分销员ID * 一级分销员ID
*/ */
@ -633,9 +633,13 @@ public class Orders implements Serializable {
*/ */
private String fxyOneUserName; private String fxyOneUserName;
/** /**
* 二级分销员分佣 * 一级分销员分佣
*/ */
private BigDecimal fxyTwoMoney; private BigDecimal fxyOneMoney;
/**
* 一级分销员分佣技师承担金额
*/
private BigDecimal fxyOneArtificerDeductMoney;
/** /**
* 二级分销员ID * 二级分销员ID
*/ */
@ -644,6 +648,14 @@ public class Orders implements Serializable {
* 二级分销员姓名 * 二级分销员姓名
*/ */
private String fxyTwoUserName; private String fxyTwoUserName;
/**
* 二级分销员分佣
*/
private BigDecimal fxyTwoMoney;
/**
* 二级分销员分佣技师承担金额
*/
private BigDecimal fxyTwoArtificerDeductMoney;
public Orders() {} 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; private FxyApplyService service;
@Autowired @Autowired
private FxyDataService dataService; private FxyConfigService configService;
@Autowired @Autowired
private FxyConfigService configService; private FxyDataService dataService;
@PostMapping("/fxyConfig") @PostMapping("/fxyConfig")
@ApiOperation("获取分销员配置") @ApiOperation("获取分销员配置")

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.entity.*;
import com.sqx.modules.artificer.service.*; import com.sqx.modules.artificer.service.*;
import com.sqx.modules.bl.commission.fxy.entity.FxyApply; 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.FxyApplyService;
import com.sqx.modules.bl.commission.fxy.service.FxyConfigService;
import com.sqx.modules.bl.massage.entity.MassagePackage; import com.sqx.modules.bl.massage.entity.MassagePackage;
import com.sqx.modules.bl.massage.service.MassagePackageService; import com.sqx.modules.bl.massage.service.MassagePackageService;
import com.sqx.modules.bl.order.dao.UserPackageOrderDao; import com.sqx.modules.bl.order.dao.UserPackageOrderDao;
@ -153,10 +155,11 @@ public class AliPayController {
private BlSadJobService blSadJobService; private BlSadJobService blSadJobService;
@Autowired @Autowired
private FxyApplyService fxyApplyService; private FxyApplyService fxyApplyService;
@Autowired
private FxyConfigService fxyConfigService;
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/** /**
* 获取总花费时间 * 获取总花费时间
* @param duration 服务时长 * @param duration 服务时长
@ -672,20 +675,136 @@ public class AliPayController {
} }
} }
orders.setShopMoney(shopMoney); orders.setShopMoney(shopMoney);
UserEntity user = userService.selectUserById(orders.getUserId()); // UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode()); // UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
BigDecimal oneUserMoney = BigDecimal.ZERO; // BigDecimal oneUserMoney = BigDecimal.ZERO;
if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) { // if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
orders.setOneUserId(oneUser.getUserId()); // orders.setOneUserId(oneUser.getUserId());
orders.setOneUserName(oneUser.getUserName()); // orders.setOneUserName(oneUser.getUserName());
oneUserMoney = artificerPrice.multiply(oneUser.getUserRate()); // oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
oneUserMoney = oneUserMoney.setScale(2, BigDecimal.ROUND_HALF_UP); // 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(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney); artificerPrice = artificerPrice.subtract(jjrMoney);
artificerPrice = artificerPrice.subtract(shopMoney); 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)){ if(orders.getIsSupplement()!=null && orders.getIsSupplement().equals(2)){
}else{ }else{
//用户收益加上通行费用 //用户收益加上通行费用
@ -700,7 +819,9 @@ public class AliPayController {
pingMoney = pingMoney.subtract(shopMoney); pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney); // pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney); 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); orders.setPingMoney(pingMoney);
ordersService.updateById(orders); ordersService.updateById(orders);
@ -774,9 +895,17 @@ public class AliPayController {
if(orders1.getAddMoney()!=null){ if(orders1.getAddMoney()!=null){
orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney())); orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney()));
orders1.setAddArtificerMoney(orders1.getAddArtificerMoney().add(orders.getArtificerMoney())); 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{ }else{
orders1.setAddMoney(orders.getPayMoney()); orders1.setAddMoney(orders.getPayMoney());
orders1.setAddArtificerMoney(orders.getArtificerMoney()); 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.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney()));
orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney())); orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney()));
@ -784,7 +913,11 @@ public class AliPayController {
// orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney())); // orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney()));
orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney()));
orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); 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())); orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney()));
if(orders1.getStatus().equals(6)){ if(orders1.getStatus().equals(6)){
@ -1620,20 +1753,136 @@ public class AliPayController {
} }
} }
orders.setShopMoney(shopMoney); orders.setShopMoney(shopMoney);
UserEntity user = userService.selectUserById(orders.getUserId()); // UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode()); // UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
BigDecimal oneUserMoney = BigDecimal.ZERO; // BigDecimal oneUserMoney = BigDecimal.ZERO;
if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) { // if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
orders.setOneUserId(oneUser.getUserId()); // orders.setOneUserId(oneUser.getUserId());
orders.setOneUserName(oneUser.getUserName()); // orders.setOneUserName(oneUser.getUserName());
oneUserMoney = artificerPrice.multiply(oneUser.getUserRate()); // oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
oneUserMoney = oneUserMoney.setScale(0, BigDecimal.ROUND_HALF_UP); // 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(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney); artificerPrice = artificerPrice.subtract(jjrMoney);
artificerPrice = artificerPrice.subtract(shopMoney); 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)){ if(orders.getIsSupplement()!=null && orders.getIsSupplement().equals(2)){
}else{ }else{
//用户收益加上通行费用 //用户收益加上通行费用
@ -1648,7 +1897,9 @@ public class AliPayController {
pingMoney = pingMoney.subtract(shopMoney); pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney); // pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney); 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); orders.setPingMoney(pingMoney);
ordersService.updateById(orders); ordersService.updateById(orders);
@ -1680,9 +1931,17 @@ public class AliPayController {
if(orders1.getAddMoney()!=null){ if(orders1.getAddMoney()!=null){
orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney())); orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney()));
orders1.setAddArtificerMoney(orders1.getAddArtificerMoney().add(orders.getArtificerMoney())); 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{ }else{
orders1.setAddMoney(orders.getPayMoney()); orders1.setAddMoney(orders.getPayMoney());
orders1.setAddArtificerMoney(orders.getArtificerMoney()); 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.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney()));
orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney())); orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney()));
@ -1690,7 +1949,11 @@ public class AliPayController {
// orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney())); // orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney()));
orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney()));
orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); 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())); orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney()));
if(orders1.getStatus().equals(6)){ if(orders1.getStatus().equals(6)){
@ -2055,20 +2318,136 @@ public class AliPayController {
} }
} }
orders.setShopMoney(shopMoney); orders.setShopMoney(shopMoney);
UserEntity user = userService.selectUserById(orders.getUserId()); // UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode()); // UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
BigDecimal oneUserMoney = BigDecimal.ZERO; // BigDecimal oneUserMoney = BigDecimal.ZERO;
if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) { // if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
orders.setOneUserId(oneUser.getUserId()); // orders.setOneUserId(oneUser.getUserId());
orders.setOneUserName(oneUser.getUserName()); // orders.setOneUserName(oneUser.getUserName());
oneUserMoney = artificerPrice.multiply(oneUser.getUserRate()); // oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
oneUserMoney = oneUserMoney.setScale(2, BigDecimal.ROUND_HALF_UP); // 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(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney); artificerPrice = artificerPrice.subtract(jjrMoney);
artificerPrice = artificerPrice.subtract(shopMoney); 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)){ if(orders.getIsSupplement()!=null && orders.getIsSupplement().equals(2)){
}else{ }else{
//用户收益加上通行费用 //用户收益加上通行费用
@ -2083,7 +2462,9 @@ public class AliPayController {
pingMoney = pingMoney.subtract(shopMoney); pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney); // pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney); 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); orders.setPingMoney(pingMoney);
ordersService.updateById(orders); ordersService.updateById(orders);
@ -2157,9 +2538,17 @@ public class AliPayController {
if(orders1.getAddMoney()!=null){ if(orders1.getAddMoney()!=null){
orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney())); orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney()));
orders1.setAddArtificerMoney(orders1.getAddArtificerMoney().add(orders.getArtificerMoney())); 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{ }else{
orders1.setAddMoney(orders.getPayMoney()); orders1.setAddMoney(orders.getPayMoney());
orders1.setAddArtificerMoney(orders.getArtificerMoney()); 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.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney()));
orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney())); orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney()));
@ -2167,7 +2556,11 @@ public class AliPayController {
// orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney())); // orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney()));
orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney()));
orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); 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())); orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney()));
if(orders1.getStatus().equals(6)){ 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.entity.*;
import com.sqx.modules.artificer.service.*; import com.sqx.modules.artificer.service.*;
import com.sqx.modules.bl.commission.fxy.entity.FxyApply; 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.FxyApplyService;
import com.sqx.modules.bl.commission.fxy.service.FxyConfigService;
import com.sqx.modules.bl.massage.entity.MassagePackage; import com.sqx.modules.bl.massage.entity.MassagePackage;
import com.sqx.modules.bl.massage.service.MassagePackageService; import com.sqx.modules.bl.massage.service.MassagePackageService;
import com.sqx.modules.bl.order.dao.UserPackageOrderDao; import com.sqx.modules.bl.order.dao.UserPackageOrderDao;
@ -145,6 +147,8 @@ public class WxServiceImpl implements WxService {
private BlSadJobService blSadJobService; private BlSadJobService blSadJobService;
@Autowired @Autowired
private FxyApplyService fxyApplyService; private FxyApplyService fxyApplyService;
@Autowired
private FxyConfigService fxyConfigService;
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -915,20 +919,136 @@ public class WxServiceImpl implements WxService {
} }
} }
orders.setShopMoney(shopMoney); orders.setShopMoney(shopMoney);
UserEntity user = userService.selectUserById(orders.getUserId()); // UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode()); // UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
BigDecimal oneUserMoney = BigDecimal.ZERO; // BigDecimal oneUserMoney = BigDecimal.ZERO;
if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) { // if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
orders.setOneUserId(oneUser.getUserId()); // orders.setOneUserId(oneUser.getUserId());
orders.setOneUserName(oneUser.getUserName()); // orders.setOneUserName(oneUser.getUserName());
oneUserMoney = artificerPrice.multiply(oneUser.getUserRate()); // oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
oneUserMoney = oneUserMoney.setScale(2, BigDecimal.ROUND_HALF_UP); // 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(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney); artificerPrice = artificerPrice.subtract(jjrMoney);
artificerPrice = artificerPrice.subtract(shopMoney); 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)){ if(orders.getIsSupplement()!=null && orders.getIsSupplement().equals(2)){
}else{ }else{
//用户收益加上通行费用 //用户收益加上通行费用
@ -943,7 +1063,9 @@ public class WxServiceImpl implements WxService {
pingMoney = pingMoney.subtract(shopMoney); pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney); // pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney); 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); orders.setPingMoney(pingMoney);
ordersService.updateById(orders); ordersService.updateById(orders);
@ -975,9 +1097,17 @@ public class WxServiceImpl implements WxService {
if(orders1.getAddMoney()!=null){ if(orders1.getAddMoney()!=null){
orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney())); orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney()));
orders1.setAddArtificerMoney(orders1.getAddArtificerMoney().add(orders.getArtificerMoney())); 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{ }else{
orders1.setAddMoney(orders.getPayMoney()); orders1.setAddMoney(orders.getPayMoney());
orders1.setAddArtificerMoney(orders.getArtificerMoney()); 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.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney()));
orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney())); orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney()));
@ -985,7 +1115,11 @@ public class WxServiceImpl implements WxService {
// orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney())); // orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney()));
orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney()));
orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); 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())); orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney()));
if(orders1.getStatus().equals(6)){ if(orders1.getStatus().equals(6)){
@ -1551,20 +1685,136 @@ public class WxServiceImpl implements WxService {
} }
} }
orders.setShopMoney(shopMoney); orders.setShopMoney(shopMoney);
UserEntity user = userService.selectUserById(orders.getUserId()); // UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode()); // UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
BigDecimal oneUserMoney = BigDecimal.ZERO; // BigDecimal oneUserMoney = BigDecimal.ZERO;
if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) { // if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
orders.setOneUserId(oneUser.getUserId()); // orders.setOneUserId(oneUser.getUserId());
orders.setOneUserName(oneUser.getUserName()); // orders.setOneUserName(oneUser.getUserName());
oneUserMoney = artificerPrice.multiply(oneUser.getUserRate()); // oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
oneUserMoney = oneUserMoney.setScale(0, BigDecimal.ROUND_HALF_UP); // 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(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney); artificerPrice = artificerPrice.subtract(jjrMoney);
artificerPrice = artificerPrice.subtract(shopMoney); 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)){ if(orders.getIsSupplement()!=null && orders.getIsSupplement().equals(2)){
}else{ }else{
//用户收益加上通行费用 //用户收益加上通行费用
@ -1579,7 +1829,9 @@ public class WxServiceImpl implements WxService {
pingMoney = pingMoney.subtract(shopMoney); pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney); // pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney); 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); orders.setPingMoney(pingMoney);
ordersService.updateById(orders); ordersService.updateById(orders);
@ -1647,9 +1899,17 @@ public class WxServiceImpl implements WxService {
if(orders1.getAddMoney()!=null){ if(orders1.getAddMoney()!=null){
orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney())); orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney()));
orders1.setAddArtificerMoney(orders1.getAddArtificerMoney().add(orders.getArtificerMoney())); 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{ }else{
orders1.setAddMoney(orders.getPayMoney()); orders1.setAddMoney(orders.getPayMoney());
orders1.setAddArtificerMoney(orders.getArtificerMoney()); 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.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney()));
orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney())); orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney()));
@ -1657,7 +1917,11 @@ public class WxServiceImpl implements WxService {
// orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney())); // orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney()));
orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney()));
orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); 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())); orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney()));
if(orders1.getStatus().equals(6)){ if(orders1.getStatus().equals(6)){
@ -2406,20 +2670,136 @@ public class WxServiceImpl implements WxService {
} }
} }
orders.setShopMoney(shopMoney); orders.setShopMoney(shopMoney);
UserEntity user = userService.selectUserById(orders.getUserId()); // UserEntity user = userService.selectUserById(orders.getUserId());
UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode()); // UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
BigDecimal oneUserMoney = BigDecimal.ZERO; // BigDecimal oneUserMoney = BigDecimal.ZERO;
if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) { // if (oneUser != null && oneUser.getIsAgency() != null && oneUser.getIsAgency() == 1) {
orders.setOneUserId(oneUser.getUserId()); // orders.setOneUserId(oneUser.getUserId());
orders.setOneUserName(oneUser.getUserName()); // orders.setOneUserName(oneUser.getUserName());
oneUserMoney = artificerPrice.multiply(oneUser.getUserRate()); // oneUserMoney = artificerPrice.multiply(oneUser.getUserRate());
oneUserMoney = oneUserMoney.setScale(0, BigDecimal.ROUND_HALF_UP); // 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(oneArtificerMoney);
artificerPrice = artificerPrice.subtract(jjrMoney); artificerPrice = artificerPrice.subtract(jjrMoney);
artificerPrice = artificerPrice.subtract(shopMoney); 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)){ if(orders.getIsSupplement()!=null && orders.getIsSupplement().equals(2)){
}else{ }else{
//用户收益加上通行费用 //用户收益加上通行费用
@ -2434,7 +2814,9 @@ public class WxServiceImpl implements WxService {
pingMoney = pingMoney.subtract(shopMoney); pingMoney = pingMoney.subtract(shopMoney);
// pingMoney = pingMoney.subtract(oneArtificerMoney); // pingMoney = pingMoney.subtract(oneArtificerMoney);
pingMoney = pingMoney.subtract(jjrMoney); 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); orders.setPingMoney(pingMoney);
ordersService.updateById(orders); ordersService.updateById(orders);
@ -2502,9 +2884,17 @@ public class WxServiceImpl implements WxService {
if(orders1.getAddMoney()!=null){ if(orders1.getAddMoney()!=null){
orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney())); orders1.setAddMoney(orders1.getAddMoney().add(orders.getPayMoney()));
orders1.setAddArtificerMoney(orders1.getAddArtificerMoney().add(orders.getArtificerMoney())); 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{ }else{
orders1.setAddMoney(orders.getPayMoney()); orders1.setAddMoney(orders.getPayMoney());
orders1.setAddArtificerMoney(orders.getArtificerMoney()); 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.setSumMoney(orders1.getSumMoney().add(orders.getPayMoney()));
orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney())); orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney()));
@ -2512,7 +2902,11 @@ public class WxServiceImpl implements WxService {
// orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney())); // orders1.setOneArtificerMoney(orders1.getOneArtificerMoney().add(orders.getOneArtificerMoney()));
orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney())); orders1.setJjrMoney(orders1.getJjrMoney().add(orders.getJjrMoney()));
orders1.setShopMoney(orders1.getShopMoney().add(orders.getShopMoney())); 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())); orders1.setPingMoney(orders1.getPingMoney().add(orders.getPingMoney()));
if(orders1.getStatus().equals(6)){ if(orders1.getStatus().equals(6)){