BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/liu-jiangs-project/RuoYi-Vue

pull/1121/head
liujiang 2025-08-05 16:55:21 +08:00
parent 5d8de92ac1 0e0036a45e
commit a18e944fbe
5 changed files with 72 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/ShoppingCartController.java
View File

@ -32,14 +32,14 @@ public class ShoppingCartController extends XktBaseController {
final IShoppingCartService shopCartService;
@PreAuthorize("@ss.hasRole('seller,agent')")
@PreAuthorize("@ss.hasAnyRoles('seller,agent')")
@ApiOperation(value = "获取用户进货车各状态数量", httpMethod = "GET", response = R.class)
@GetMapping("/status/num")
public R<ShopCartStatusCountResVO> getStatusNum() {
return R.ok(BeanUtil.toBean(shopCartService.getStatusNum(), ShopCartStatusCountResVO.class));
}
@PreAuthorize("@ss.hasRole('seller,agent')")
@PreAuthorize("@ss.hasAnyRoles('seller,agent')")
@ApiOperation(value = "电商卖家添加商品到进货车", httpMethod = "POST", response = R.class)
@Log(title = "电商卖家添加商品到进货车", businessType = BusinessType.INSERT)
@PostMapping
@ -47,7 +47,7 @@ public class ShoppingCartController extends XktBaseController {
return R.ok(shopCartService.create(BeanUtil.toBean(shopCartVO, ShoppingCartDTO.class)));
}
@PreAuthorize("@ss.hasRole('seller,agent')")
@PreAuthorize("@ss.hasAnyRoles('seller,agent')")
@ApiOperation(value = "电商卖家编辑进货车商品", httpMethod = "PUT", response = R.class)
@Log(title = "电商卖家编辑进货车商品", businessType = BusinessType.UPDATE)
@PutMapping
@ -55,28 +55,28 @@ public class ShoppingCartController extends XktBaseController {
return R.ok(shopCartService.update(BeanUtil.toBean(editVO, ShoppingCartEditDTO.class)));
}
@PreAuthorize("@ss.hasRole('seller,agent')")
@PreAuthorize("@ss.hasAnyRoles('seller,agent')")
@ApiOperation(value = "获取用户进货车列表", httpMethod = "POST", response = R.class)
@PostMapping("/page")
public R<Page<ShopCartPageResDTO>> page(@Validated @RequestBody ShopCartPageVO pageVO) {
return R.ok(shopCartService.page(BeanUtil.toBean(pageVO, ShopCartPageDTO.class)));
}
@PreAuthorize("@ss.hasRole('seller,agent')")
@PreAuthorize("@ss.hasAnyRoles('seller,agent')")
@ApiOperation(value = "用户进货车列表点击编辑获取数据", httpMethod = "GET", response = R.class)
@GetMapping("/edit/{shoppingCartId}")
public R<ShopCartEditDetailResVO> getEditInfo(@PathVariable Long shoppingCartId) {
return R.ok(BeanUtil.toBean(shopCartService.getEditInfo(shoppingCartId), ShopCartEditDetailResVO.class));
}
@PreAuthorize("@ss.hasRole('seller,agent')")
@PreAuthorize("@ss.hasAnyRoles('seller,agent')")
@ApiOperation(value = "进货车下单时及商品下单时获取商品列表", httpMethod = "POST", response = R.class)
@PostMapping("/list")
public R<List<ShopCartResVO>> getList(@Validated @RequestBody ShopCartListVO listVO) {
return R.ok(BeanUtil.copyToList(shopCartService.getList(BeanUtil.toBean(listVO, ShopCartListDTO.class)), ShopCartResVO.class));
}
@PreAuthorize("@ss.hasRole('seller,agent')")
@PreAuthorize("@ss.hasAnyRoles('seller,agent')")
@ApiOperation(value = "用户删除进货车商品", httpMethod = "DELETE", response = R.class)
@Log(title = "用户删除进货车商品", businessType = BusinessType.DELETE)
@DeleteMapping

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java
View File

@ -69,7 +69,7 @@ public class StoreOrderController extends XktBaseController {
@Autowired
private RedisCache redisCache;
@PreAuthorize("@ss.hasRole('seller,agent')")
@PreAuthorize("@ss.hasAnyRoles('seller,agent')")
@Log(title = "订单", businessType = BusinessType.INSERT)
@ApiOperation("创建订单")
@PostMapping("create")
@ -85,7 +85,7 @@ public class StoreOrderController extends XktBaseController {
return success(respVO);
}
@PreAuthorize("@ss.hasRole('seller,agent')")
@PreAuthorize("@ss.hasAnyRoles('seller,agent')")
@Log(title = "订单", businessType = BusinessType.UPDATE)
@ApiOperation("修改订单")
@PostMapping("edit")
@ -98,7 +98,7 @@ public class StoreOrderController extends XktBaseController {
return success(result.getOrder().getId());
}
@PreAuthorize("@ss.hasRole('seller,agent')")
@PreAuthorize("@ss.hasAnyRoles('seller,agent')")
@Log(title = "订单", businessType = BusinessType.OTHER)
@ApiOperation("支付订单")
@PostMapping("pay")
@ -115,7 +115,7 @@ public class StoreOrderController extends XktBaseController {
return success(respVO);
}
@PreAuthorize("@ss.hasRole('seller,agent')")
@PreAuthorize("@ss.hasAnyRoles('seller,agent')")
@Log(title = "订单", businessType = BusinessType.UPDATE)
@ApiOperation("取消订单")
@PostMapping("cancel")
@ -283,7 +283,7 @@ public class StoreOrderController extends XktBaseController {
public R receipt(@Valid @RequestBody StoreOrderReceiptReqVO vo) {
//仅本人可操作
storeOrderService.checkOrderUser(vo.getStoreOrderId(), SecurityUtils.getUserId());
storeOrderService.receiptOrder(vo.getStoreOrderId(), SecurityUtils.getUserId());
storeOrderService.completeOrder(vo.getStoreOrderId(), SecurityUtils.getUserId());
return success();
}

2
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
View File

@ -270,4 +270,6 @@ public class Constants
public static final BigDecimal ZERO_POINT_ONE = BigDecimal.valueOf(0.1);
public static final BigDecimal ALI_SERVICE_FEE_RATE = BigDecimal.valueOf(0.006);
}

2
xkt/src/main/java/com/ruoyi/xkt/service/impl/AssetServiceImpl.java
View File

@ -75,7 +75,7 @@ public class AssetServiceImpl implements IAssetService {
EPayChannel payChannel) {
Assert.notNull(storeId);
Assert.notEmpty(transactionPassword);
Assert.isTrue(NumberUtil.isGreaterOrEqual(amount, Constants.ZERO_POINT_ONE), "提现金额不能低于0.1元");
Assert.isTrue(NumberUtil.isGreaterOrEqual(amount, BigDecimal.ONE), "提现金额不能低于1元");
InternalAccount internalAccount = internalAccountService.getAccountAndCheck(storeId, EAccountOwnerType.STORE);
ExternalAccount externalAccount = externalAccountService.getAccountAndCheck(storeId, EAccountOwnerType.STORE,
EAccountType.getByChannel(payChannel));

99
xkt/src/main/java/com/ruoyi/xkt/service/impl/FinanceBillServiceImpl.java
View File

@ -35,6 +35,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@ -209,12 +210,13 @@ public class FinanceBillServiceImpl implements IFinanceBillService {
afterSaleOrderDetailMap.put(afterSaleOrderDetail.getOriginOrderDetailId(), afterSaleOrderDetail);
}
}
Map<Long, FinanceBill> refundPaymentBillMap = MapUtil.empty();
Map<Long, FinanceBillDetail> refundPaymentBillDetailMap = MapUtil.empty();
Map<Long, FinanceBill> refundPaymentBillMap;
Map<Long, FinanceBillDetail> refundPaymentBillDetailMap;
if (CollUtil.isNotEmpty(afterSaleBillUks)) {
refundPaymentBillMap = financeBillMapper.selectList(
Wrappers.lambdaQuery(FinanceBill.class)
.in(FinanceBill::getBusinessUniqueKey, afterSaleBillUks)
.eq(FinanceBill::getBillType, EFinBillType.PAYMENT.getValue())
.eq(SimpleEntity::getDelFlag, Constants.UNDELETED))
.stream()
.collect(Collectors.toMap(SimpleEntity::getId, Function.identity()));
@ -224,50 +226,58 @@ public class FinanceBillServiceImpl implements IFinanceBillService {
.in(FinanceBillDetail::getFinanceBillId, refundPaymentBillMap.keySet())
.eq(SimpleEntity::getDelFlag, Constants.UNDELETED)).stream()
.collect(Collectors.toMap(FinanceBillDetail::getRelId, Function.identity()));
} else {
refundPaymentBillMap = MapUtil.empty();
refundPaymentBillDetailMap = MapUtil.empty();
}
BigDecimal businessAmount = BigDecimal.ZERO;
BigDecimal transAmount = BigDecimal.ZERO;
Integer goodsQuantity = 0;
List<FinanceBillDetail> billDetails = new ArrayList<>(orderExt.getOrderDetails().size());
for (StoreOrderDetail orderDetail : orderExt.getOrderDetails()) {
FinanceBillDetail billDetail = new FinanceBillDetail();
billDetail.setRelType(EFinBillDetailRelType.STORE_ORDER_DETAIL.getValue());
billDetail.setRelId(orderDetail.getId());
billDetail.setBusinessAmount(orderDetail.getTotalAmount());
billDetail.setTransAmount(orderDetail.getRealTotalAmount());
goodsQuantity += orderDetail.getGoodsQuantity();
billDetail.setDelFlag(Constants.UNDELETED);
billDetails.add(billDetail);
StoreOrderDetail afterSaleOrderDetail = afterSaleOrderDetailMap.get(orderDetail.getId());
if (afterSaleOrderDetail != null
&& EPayStatus.PAID.getValue().equals(afterSaleOrderDetail.getPayStatus())) {
//扣除已退款部分数量
goodsQuantity -= afterSaleOrderDetail.getGoodsQuantity();
//退款单据
FinanceBillDetail refundPaymentBillDetail = refundPaymentBillDetailMap
.get(afterSaleOrderDetail.getId());
Assert.notNull(refundPaymentBillDetail);
FinanceBill refundPaymentBill = refundPaymentBillMap
.get(refundPaymentBillDetail.getFinanceBillId());
Assert.notNull(refundPaymentBill);
Assert.isTrue(EFinBillStatus.SUCCESS.getValue().equals(refundPaymentBill.getBillStatus()));
//扣除已退款部分金额
billDetail.setBusinessAmount(NumberUtil.sub(billDetail.getBusinessAmount(),
refundPaymentBillDetail.getBusinessAmount()));
billDetail.setTransAmount(NumberUtil.sub(billDetail.getTransAmount(),
refundPaymentBillDetail.getTransAmount()));
}
businessAmount = NumberUtil.add(businessAmount, billDetail.getBusinessAmount());
transAmount = NumberUtil.add(transAmount, billDetail.getTransAmount());
BigDecimal refundBusinessAmount = BigDecimal.ZERO;
BigDecimal refundTransAmount = BigDecimal.ZERO;
for (FinanceBill refundBill : refundPaymentBillMap.values()) {
//退款金额
refundBusinessAmount = NumberUtil.add(refundBusinessAmount, refundBill.getBusinessAmount());
refundTransAmount = NumberUtil.add(refundTransAmount, refundBill.getTransAmount());
}
BigDecimal businessAmount = NumberUtil.sub(orderExt.getOrder().getTotalAmount(), refundBusinessAmount);
BigDecimal transAmount = NumberUtil.sub(orderExt.getOrder().getRealTotalAmount(), refundTransAmount);
int goodsQuantity = 0;
int refundGoodsQuantity = 0;
if (NumberUtil.equals(BigDecimal.ZERO, transAmount)) {
log.info("订单[{}]已全部退款，完成时不再创建转移单", orderExt.getOrder().getId());
return null;
}
List<FinanceBillDetail> billDetails = new ArrayList<>(orderExt.getOrderDetails().size());
for (StoreOrderDetail orderDetail : orderExt.getOrderDetails()) {
StoreOrderDetail refundOrderDetail = afterSaleOrderDetailMap.get(orderDetail.getId());
FinanceBillDetail refundBillDetail = Optional.ofNullable(refundOrderDetail)
.map(rod -> refundPaymentBillDetailMap.get(rod.getId())).orElse(null);
FinanceBillDetail billDetail = new FinanceBillDetail();
billDetail.setRelType(EFinBillDetailRelType.STORE_ORDER_DETAIL.getValue());
billDetail.setRelId(orderDetail.getId());
if (refundBillDetail == null) {
billDetail.setBusinessAmount(orderDetail.getTotalAmount());
billDetail.setTransAmount(orderDetail.getRealTotalAmount());
} else {
FinanceBill refundBill = refundPaymentBillMap
.get(refundBillDetail.getFinanceBillId());
Assert.notNull(refundBill);
Assert.isTrue(EFinBillStatus.SUCCESS.getValue().equals(refundBill.getBillStatus()));
//扣除已退款部分金额
billDetail.setBusinessAmount(NumberUtil.sub(orderDetail.getTotalAmount(),
refundBillDetail.getBusinessAmount()));
billDetail.setTransAmount(NumberUtil.sub(orderDetail.getRealTotalAmount(),
refundBillDetail.getTransAmount()));
//已退款部分数量
refundGoodsQuantity += refundOrderDetail.getGoodsQuantity();
}
goodsQuantity += orderDetail.getGoodsQuantity();
billDetail.setDelFlag(Constants.UNDELETED);
billDetails.add(billDetail);
}
bill.setBusinessAmount(businessAmount);
bill.setTransAmount(transAmount);
bill.setRemark(CharSequenceUtil.format("档口代发订单{}双，共计{}元", goodsQuantity,
transAmount.toPlainString()));
String refundStr = refundGoodsQuantity == 0 ? "" : "，退货" + refundGoodsQuantity + "双";
bill.setRemark(CharSequenceUtil.format("档口代发订单{}双{}，共计{}元", goodsQuantity,
refundStr, transAmount.toPlainString()));
bill.setVersion(0L);
bill.setDelFlag(Constants.UNDELETED);
financeBillMapper.insert(prepareInsert(bill));
@ -381,7 +391,7 @@ public class FinanceBillServiceImpl implements IFinanceBillService {
@Override
public FinanceBillExt createWithdrawPaymentBill(Long storeId, BigDecimal amount, EPayChannel payChannel) {
Assert.notNull(storeId);
Assert.isTrue(NumberUtil.isGreater(amount, BigDecimal.ZERO), "提现金额异常");
Assert.isTrue(NumberUtil.isGreaterOrEqual(amount, BigDecimal.ONE), "提现金额异常");
Assert.notNull(payChannel);
FinanceBill bill = new FinanceBill();
bill.setBillNo(generateBillNo(EFinBillType.PAYMENT));
@ -401,15 +411,20 @@ public class FinanceBillServiceImpl implements IFinanceBillService {
bill.setInputExternalAccountId(inputExternalAccountId);
bill.setOutputExternalAccountId(payChannel.getPlatformExternalAccountId());
bill.setBusinessAmount(amount);
bill.setTransAmount(amount);
bill.setRemark(CharSequenceUtil.format("账户提现{}元", amount.toPlainString()));
//支付宝服务费 TODO 再次确认
BigDecimal aliServiceFee = NumberUtil.mul(amount, Constants.ALI_SERVICE_FEE_RATE)
.setScale(2, RoundingMode.HALF_UP);
bill.setTransAmount(NumberUtil.sub(amount, aliServiceFee));
bill.setRemark(CharSequenceUtil.format("账户提现{}元，支付宝服务费{}元",
bill.getTransAmount().toPlainString(), aliServiceFee.toPlainString()));
bill.setVersion(0L);
bill.setDelFlag(Constants.UNDELETED);
financeBillMapper.insert(prepareInsert(bill));
TransInfo transInfo = TransInfo.builder()
.srcBillId(bill.getId())
.srcBillType(bill.getBillType())
.transAmount(bill.getTransAmount())
//账户变动金额(含服务费)
.transAmount(bill.getBusinessAmount())
.transTime(new Date())
.handlerId(null)
.remark("账户提现")