b2894lxlx/yunxinwei-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
gxwebsoft
2023-12-20 14:19:06 +08:00
parent 4ae7261195 12fa7348cb
commit 2a38f01da7
4 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/gxwebsoft/apps/task/OrderTask.java
View File

@@ -166,7 +166,7 @@ public class OrderTask {
orderPayService.save(newRenewOrder);
// 已生成订单未付款
} else if (item.getPayStatus().equals(PAY_STATUS_NO_PAY)) {
} else if (item.getPayStatus().equals(PAY_STATUS_NO_PAY) && now.isAfter(item.getStartTime())) {
long between = DateUtil.between(item.getStartTime(), now, DateUnit.DAY);
if (item.getExpirationDay() != between) {
// 更新逾期时间
@@ -195,13 +195,14 @@ public class OrderTask {
/**
* 计算分润
*/
// @Scheduled(cron="0 0/1 * * * ? ")
@Scheduled(cron="0 0/1 * * * ? ")
@Transactional
public void CalcProfit() {
log.info("开始计算分润");
// 查询所有未结算订单
LambdaQueryWrapper<OrderPay> wrapper = Wrappers.lambdaQuery(OrderPay.class)
.eq(OrderPay::getIsSettled, ORDER_SETTLED_NO)
.gt(OrderPay::getEquipmentId, 0)
.eq(OrderPay::getPayStatus, PAY_STATUS_SUCCESS);
List<OrderPay> orderList = orderPayService.list(wrapper);
@@ -317,7 +318,7 @@ public class OrderTask {
}
Equipment equipment = equipmentMap.get(order.getEquipmentId());
// 投资人收益
if (touziProfit.compareTo(BigDecimal.ZERO) > 0) {
if (touziProfit.compareTo(BigDecimal.ZERO) > 0 && equipment!= null) {
User touziUser = touziUserMap.get(equipment.getTouziUserId());
if (touziUser != null) {
@@ -332,7 +333,7 @@ public class OrderTask {
profitLog.setComments("投资设备：" + equipment.getEquipmentCode());
profitLog.setEquipmentCode(equipment.getEquipmentCode());
profitLog.setMerchantName(merchant.getMerchantName());
profitLog.setOrderSource(order.getGoodsId());
profitLog.setOrderSource(order.getOrderSource());
// profitLog.setIsRenew(order.getIsRenew());
profitLogService.save(profitLog);
}
@@ -353,7 +354,7 @@ public class OrderTask {
profitLog.setComments("推广收益：" + order.getUserId());
profitLog.setEquipmentCode(equipment.getEquipmentCode());
profitLog.setMerchantName(merchant.getMerchantName());
profitLog.setOrderSource(order.getGoodsId());
profitLog.setOrderSource(order.getOrderSource());
// profitLog.setIsRenew(order.getIsRenew());
profitLogService.save(profitLog);
}
@@ -375,7 +376,7 @@ public class OrderTask {
profitLog.setComments("门店收益：" + order.getMerchantCode());
profitLog.setEquipmentCode(equipment.getEquipmentCode());
profitLog.setMerchantName(merchant.getMerchantName());
profitLog.setOrderSource(order.getGoodsId());
profitLog.setOrderSource(order.getOrderSource());
// profitLog.setIsRenew(order.getIsRenew());
profitLogService.save(profitLog);
}
@@ -405,7 +406,7 @@ public class OrderTask {
profitLog.setComments("区域经理收益：" + order.getMerchantCode());
profitLog.setEquipmentCode(equipment.getEquipmentCode());
profitLog.setMerchantName(merchant.getMerchantName());
profitLog.setOrderSource(order.getGoodsId());
profitLog.setOrderSource(order.getOrderSource());
// profitLog.setIsRenew(order.getIsRenew());
profitLogService.save(profitLog);
}
@@ -415,8 +416,8 @@ public class OrderTask {
}
// 设置为已结算
LambdaUpdateWrapper<Order> updateWrapper = Wrappers.lambdaUpdate(Order.class).in(Order::getOrderId, orderIds).set(Order::getIsSettled, 1);
orderService.update(updateWrapper);
LambdaUpdateWrapper<OrderPay> updateWrapper = Wrappers.lambdaUpdate(OrderPay.class).in(OrderPay::getId, orderIds).set(OrderPay::getIsSettled, 1);
orderPayService.update(updateWrapper);
}
}

7
src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
View File

@@ -21,8 +21,10 @@ import com.gxwebsoft.common.system.entity.User;
import com.gxwebsoft.oa.service.IdcardService;
import com.gxwebsoft.oa.vo.IdcardRespVO;
import com.gxwebsoft.shop.entity.Order;
import com.gxwebsoft.shop.entity.OrderPay;
import com.gxwebsoft.shop.entity.OrderRefund;
import com.gxwebsoft.shop.param.OrderParam;
import com.gxwebsoft.shop.service.OrderPayService;
import com.gxwebsoft.shop.service.OrderRefundService;
import com.gxwebsoft.shop.service.OrderService;
import io.swagger.annotations.Api;
@@ -65,6 +67,9 @@ public class OpenEquipmentController extends BaseController {
@Resource
private OrderRefundService orderRefundService;
@Resource
private OrderPayService orderPayService;
@Resource
private IdcardService idcardService;
@@ -275,6 +280,8 @@ public class OpenEquipmentController extends BaseController {
e.printStackTrace();
}
orderPayService.lambdaUpdate().set(OrderPay::getEquipmentId, one.getEquipmentId()).update();
return success("绑定成功");
}
return fail("绑定失败");

1
src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java
View File

@@ -113,6 +113,7 @@ public class OrderPayController extends BaseController {
one.setMerchantName(order.getMerchantName());
one.setOutRequestNo(order.getOutRequestNo());
one.setBatteryRent(order.getBatteryRent());
one.setOrderSource(order.getOrderSource());
if(order.getOrderSource() == 20) {
// 每期还款+手续费
one.setTotalPrice(eg.getRepayment().add(eg.getServiceCharges()));