czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Tankaikai
2025-03-12 16:13:25 +08:00
parent 4d15bb4961 59ea0c5d5d
commit 1c6055dd7c
4 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java
View File

@@ -60,8 +60,6 @@ public class UserOrderController {
@Debounce(value = "#addDto.tableCode") @Debounce(value = "#addDto.tableCode")
public CzgResult<OrderInfo> createOrder(@RequestBody OrderInfoAddDTO addDto) { public CzgResult<OrderInfo> createOrder(@RequestBody OrderInfoAddDTO addDto) {
addDto.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType")); addDto.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"));
long loginIdAsLong = StpKit.USER.getLoginIdAsLong();
log.info("获取到的用户Id为:{}", loginIdAsLong);
// addDto.setUserId(StpKit.USER.getLoginIdAsLong()); // addDto.setUserId(StpKit.USER.getLoginIdAsLong());
addDto.setShopId(StpKit.USER.getShopId()); addDto.setShopId(StpKit.USER.getShopId());
addDto.setOrderType("miniapp"); addDto.setOrderType("miniapp");

15
cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderPayment.java
View File

@@ -41,6 +41,10 @@ public class OrderPayment implements Serializable {
* 来源Id 订单Id或充值id * 来源Id 订单Id或充值id
*/ */
private Long sourceId; private Long sourceId;
/**
* 霸王餐充值为 订单id 会员充值为 活动id
*/
private Long relatedId;
/** /**
* 支付方式：order,refund, memberIn,memberRefund, free * 支付方式：order,refund, memberIn,memberRefund, free
@@ -93,4 +97,15 @@ public class OrderPayment implements Serializable {
this.authCode = authCode; this.authCode = authCode;
this.amount = amount; this.amount = amount;
} }
public OrderPayment(@NonNull Long shopId,@NonNull Long sourceId, @NotBlank String payType, @NotBlank String orderNo,
String authCode, @NonNull BigDecimal amount, Long relatedId) {
this.shopId = shopId;
this.sourceId = sourceId;
this.payType = payType;
this.orderNo = orderNo;
this.authCode = authCode;
this.amount = amount;
this.relatedId = relatedId;
}
} }

22
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@@ -535,25 +535,22 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
} else { } else {
shopUserMoneyEditDTO.setBizEnum(ShopUserFlowBizEnum.CASH_IN); shopUserMoneyEditDTO.setBizEnum(ShopUserFlowBizEnum.CASH_IN);
} }
String extParam = czgCallBackDto.getExtParam(); //更新会员余额 并生成流水
JSONObject jsonObject = JSONObject.parseObject(extParam); Long flowId = shopUserService.updateMoney(shopUser.getShopId(), shopUserMoneyEditDTO);
if (payment.getRelatedId() == null) {
return;
}
if (isFree) { if (isFree) {
if (StrUtil.isBlank(jsonObject.getString("orderId"))) {
throw new ValidateException("霸王餐支付，订单号处理失败");
}
shopUserMoneyEditDTO.setBizEnum(ShopUserFlowBizEnum.FREE_IN); shopUserMoneyEditDTO.setBizEnum(ShopUserFlowBizEnum.FREE_IN);
updateChain().eq(OrderInfo::getId, czgCallBackDto.getExtParam()) updateChain().eq(OrderInfo::getId, payment.getRelatedId())
.set(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()) .set(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
.set(OrderInfo::getIsFreeDine, 1) .set(OrderInfo::getIsFreeDine, 1)
.set(OrderInfo::getPayAmount, 0) .set(OrderInfo::getPayAmount, 0)
.update(); .update();
} } else {
//更新会员余额 并生成流水
Long flowId = shopUserService.updateMoney(shopUser.getShopId(), shopUserMoneyEditDTO);
if (!isFree) {
//会员活动 //会员活动
activateService.giveActivate(shopUser, new BigDecimal(czgCallBackDto.getAmount()).divide(new BigDecimal(100), 2, RoundingMode.DOWN), activateService.giveActivate(shopUser, new BigDecimal(czgCallBackDto.getAmount()).divide(new BigDecimal(100), 2, RoundingMode.DOWN),
StrUtil.isNotBlank(jsonObject.getString("activateId")) ? jsonObject.getLong("activateId") : null, flowId); payment.getRelatedId(), flowId);
} }
} }
@@ -670,7 +667,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
private OrderInfo initOrderInfo(OrderInfoAddDTO param, ShopInfo shopInfo, ShopTable table) { private OrderInfo initOrderInfo(OrderInfoAddDTO param, ShopInfo shopInfo, ShopTable table) {
OrderInfo orderInfo = new OrderInfo(); OrderInfo orderInfo = new OrderInfo();
if (param.getOrderId() != null) { if (param.getOrderId() != null) {
orderInfo.setUserId(param.getUserId());
orderInfo = getById(param.getOrderId()); orderInfo = getById(param.getOrderId());
if (!OrderStatusEnums.UNPAID.getCode().equals(orderInfo.getStatus())) { if (!OrderStatusEnums.UNPAID.getCode().equals(orderInfo.getStatus())) {
throw new ValidateException("生成订单失败，订单已结束，请重新下单"); throw new ValidateException("生成订单失败，订单已结束，请重新下单");
@@ -678,7 +674,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
} else { } else {
orderInfo.setOrderNo(param.getPlatformType() + IdUtil.getSnowflakeNextId()); orderInfo.setOrderNo(param.getPlatformType() + IdUtil.getSnowflakeNextId());
orderInfo.setShopId(param.getShopId()); orderInfo.setShopId(param.getShopId());
orderInfo.setUserId(param.getUserId());
if (table != null) { if (table != null) {
orderInfo.setTableCode(table.getTableCode()); orderInfo.setTableCode(table.getTableCode());
orderInfo.setTableName(table.getName()); orderInfo.setTableName(table.getName());
@@ -706,6 +701,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
orderInfo.setSeatAmount(shopInfo.getTableFee().multiply(new BigDecimal(param.getSeatNum()))); orderInfo.setSeatAmount(shopInfo.getTableFee().multiply(new BigDecimal(param.getSeatNum())));
orderInfo.setSeatNum(param.getSeatNum()); orderInfo.setSeatNum(param.getSeatNum());
} }
orderInfo.setUserId(param.getUserId());
orderInfo.setTableCode(param.getTableCode()); orderInfo.setTableCode(param.getTableCode());
orderInfo.setPlaceNum(param.getPlaceNum()); orderInfo.setPlaceNum(param.getPlaceNum());
orderInfo.setOriginAmount(param.getOriginAmount()); orderInfo.setOriginAmount(param.getOriginAmount());

47
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
View File

@@ -353,13 +353,10 @@ public class PayServiceImpl implements PayService {
AssertUtil.isBlank(payParam.getOpenId(), "用户小程序ID不能为空"); AssertUtil.isBlank(payParam.getOpenId(), "用户小程序ID不能为空");
AssertUtil.isBlank(payParam.getPayType(), "支付方式不能为空"); AssertUtil.isBlank(payParam.getPayType(), "支付方式不能为空");
String payOrderNo = payParam.getPlatformType() + IdUtil.getSnowflakeNextId(); String payOrderNo = payParam.getPlatformType() + IdUtil.getSnowflakeNextId();
initOrderPayment(new OrderPayment(payParam.getShopId(), shopUser.getId(), isFree ? "free" : "memberIn", payOrderNo, "", payParam.getAmount())); initOrderPayment(new OrderPayment(payParam.getShopId(), shopUser.getId(), isFree ? "free" : "memberIn", payOrderNo,
JSONObject jsonObject = new JSONObject(); "", payParam.getAmount(),isFree ? payParam.getOrderId() : payParam.getActivateId()));
jsonObject.put("orderId", payParam.getOrderId() == null ? "" : payParam.getOrderId().toString());
jsonObject.put("activateId", payParam.getActivateId() == null ? "" : payParam.getActivateId().toString());
String extParam = jsonObject.toJSONString();
return jsPay(payParam.getShopId(), payParam.getPayType(), new CzgJsPayReq(payOrderNo, payParam.getAmount().multiply(MONEY_RATE).longValue(), return jsPay(payParam.getShopId(), payParam.getPayType(), new CzgJsPayReq(payOrderNo, payParam.getAmount().multiply(MONEY_RATE).longValue(),
"会员充值", payParam.getOpenId(), clintIp, payParam.getReturnUrl(), payParam.getBuyerRemark(), extParam)); "会员充值", payParam.getOpenId(), clintIp, payParam.getReturnUrl(), payParam.getBuyerRemark(), ""));
} }
@Override @Override
@@ -371,13 +368,10 @@ public class PayServiceImpl implements PayService {
AssertUtil.isBlank(payParam.getOpenId(), "用户小程序ID不能为空"); AssertUtil.isBlank(payParam.getOpenId(), "用户小程序ID不能为空");
AssertUtil.isBlank(payParam.getPayType(), "支付方式不能为空"); AssertUtil.isBlank(payParam.getPayType(), "支付方式不能为空");
String payOrderNo = payParam.getPlatformType() + IdUtil.getSnowflakeNextId(); String payOrderNo = payParam.getPlatformType() + IdUtil.getSnowflakeNextId();
initOrderPayment(new OrderPayment(payParam.getShopId(), shopUser.getId(), isFree ? "free" : "memberIn", payOrderNo, "", payParam.getAmount())); initOrderPayment(new OrderPayment(payParam.getShopId(), shopUser.getId(), isFree ? "free" : "memberIn", payOrderNo,
JSONObject jsonObject = new JSONObject(); "", payParam.getAmount(),isFree ? payParam.getOrderId() : payParam.getActivateId()));
jsonObject.put("orderId", payParam.getOrderId() == null ? "" : payParam.getOrderId().toString());
jsonObject.put("activateId", payParam.getActivateId() == null ? "" : payParam.getActivateId().toString());
String extParam = jsonObject.toJSONString();
return ltPay(payParam.getShopId(), payParam.getPayType(), new CzgLtPayReq(payOrderNo, payParam.getAmount().multiply(MONEY_RATE).longValue(), return ltPay(payParam.getShopId(), payParam.getPayType(), new CzgLtPayReq(payOrderNo, payParam.getAmount().multiply(MONEY_RATE).longValue(),
payParam.getPayType(), "会员充值", payParam.getOpenId(), clintIp, payParam.getReturnUrl(), payParam.getBuyerRemark(), extParam)); payParam.getPayType(), "会员充值", payParam.getOpenId(), clintIp, payParam.getReturnUrl(), payParam.getBuyerRemark(), ""));
} }
@Override @Override
@@ -387,13 +381,10 @@ public class PayServiceImpl implements PayService {
ShopUser shopUser = shopUserService.getById(payParam.getShopUserId()); ShopUser shopUser = shopUserService.getById(payParam.getShopUserId());
AssertUtil.isNull(shopUser, "充值失败 该店铺用户不存在"); AssertUtil.isNull(shopUser, "充值失败 该店铺用户不存在");
String payOrderNo = payParam.getPlatformType() + IdUtil.getSnowflakeNextId(); String payOrderNo = payParam.getPlatformType() + IdUtil.getSnowflakeNextId();
initOrderPayment(new OrderPayment(payParam.getShopId(), shopUser.getId(), isFree ? "free" : "memberIn", payOrderNo, "", payParam.getAmount())); initOrderPayment(new OrderPayment(payParam.getShopId(), shopUser.getId(), isFree ? "free" : "memberIn", payOrderNo,
JSONObject jsonObject = new JSONObject(); "", payParam.getAmount(), isFree ? payParam.getOrderId() : payParam.getActivateId()));
jsonObject.put("orderId", payParam.getOrderId() == null ? "" : payParam.getOrderId().toString());
jsonObject.put("activateId", payParam.getActivateId() == null ? "" : payParam.getActivateId().toString());
String extParam = jsonObject.toJSONString();
return scanPay(payParam.getShopId(), new CzgScanPayReq(payOrderNo, payParam.getAmount().multiply(MONEY_RATE).longValue(), return scanPay(payParam.getShopId(), new CzgScanPayReq(payOrderNo, payParam.getAmount().multiply(MONEY_RATE).longValue(),
"会员充值", clintIp, payParam.getReturnUrl(), payParam.getBuyerRemark(), extParam)); "会员充值", clintIp, payParam.getReturnUrl(), payParam.getBuyerRemark(), ""));
} }
@Override @Override
@@ -404,13 +395,10 @@ public class PayServiceImpl implements PayService {
ShopUser shopUser = shopUserService.getById(payParam.getShopUserId()); ShopUser shopUser = shopUserService.getById(payParam.getShopUserId());
AssertUtil.isNull(shopUser, "充值失败 该店铺用户不存在"); AssertUtil.isNull(shopUser, "充值失败 该店铺用户不存在");
String payOrderNo = payParam.getPlatformType() + IdUtil.getSnowflakeNextId(); String payOrderNo = payParam.getPlatformType() + IdUtil.getSnowflakeNextId();
initOrderPayment(new OrderPayment(payParam.getShopId(), shopUser.getId(), isFree ? "free" : "memberIn", payOrderNo, payParam.getAuthCode(), payParam.getAmount())); initOrderPayment(new OrderPayment(payParam.getShopId(), shopUser.getId(), isFree ? "free" : "memberIn", payOrderNo,
JSONObject jsonObject = new JSONObject(); payParam.getAuthCode(), payParam.getAmount(), isFree ? payParam.getOrderId() : payParam.getActivateId()));
jsonObject.put("orderId", payParam.getOrderId() == null ? "" : payParam.getOrderId().toString());
jsonObject.put("activateId", payParam.getActivateId() == null ? "" : payParam.getActivateId().toString());
String extParam = jsonObject.toJSONString();
return microPay(payParam.getShopId(), new CzgMicroPayReq(payOrderNo, payParam.getAmount().multiply(MONEY_RATE).longValue(), return microPay(payParam.getShopId(), new CzgMicroPayReq(payOrderNo, payParam.getAmount().multiply(MONEY_RATE).longValue(),
"会员充值", payParam.getAuthCode(), payParam.getBuyerRemark(), extParam)); "会员充值", payParam.getAuthCode(), payParam.getBuyerRemark(), ""));
} }
@Override @Override
@@ -550,17 +538,22 @@ public class PayServiceImpl implements PayService {
} }
} else { } else {
orderInfo.setStatus(OrderStatusEnums.REFUND.getCode()); orderInfo.setStatus(OrderStatusEnums.REFUND.getCode());
// ssss
List<OrderDetail> orderDetails = orderDetailService.queryChain() List<OrderDetail> orderDetails = orderDetailService.queryChain()
.select(OrderDetail::getId, OrderDetail::getNum, OrderDetail::getReturnNum, OrderDetail::getReturnNum) .select(OrderDetail::getId, OrderDetail::getProductId, OrderDetail::getNum, OrderDetail::getReturnNum, OrderDetail::getReturnNum)
.eq(OrderDetail::getOrderId, orderInfo.getId()) .eq(OrderDetail::getOrderId, orderInfo.getId())
.list(); .list();
for (OrderDetail orderDetail : orderDetails) { for (OrderDetail orderDetail : orderDetails) {
if (isPay) { if (isPay) {
returnProMap.put(Convert.toStr(orderDetail.getProductId()), orderDetail.getNum().subtract(orderDetail.getReturnNum()).subtract(orderDetail.getRefundNum())); if (orderDetail.getProductId() != null && orderDetail.getProductId() > 0) {
returnProMap.put(Convert.toStr(orderDetail.getProductId()), orderDetail.getNum().subtract(orderDetail.getReturnNum()).subtract(orderDetail.getRefundNum()));
}
orderDetail.setRefundNum(orderDetail.getNum().subtract(orderDetail.getReturnNum())); orderDetail.setRefundNum(orderDetail.getNum().subtract(orderDetail.getReturnNum()));
orderDetail.setStatus(OrderStatusEnums.REFUND.getCode()); orderDetail.setStatus(OrderStatusEnums.REFUND.getCode());
} else { } else {
returnProMap.put(Convert.toStr(orderDetail.getProductId()), orderDetail.getNum().subtract(orderDetail.getReturnNum())); if (orderDetail.getProductId() != null && orderDetail.getProductId() > 0) {
returnProMap.put(Convert.toStr(orderDetail.getProductId()), orderDetail.getNum().subtract(orderDetail.getReturnNum()));
}
orderDetail.setReturnNum(orderDetail.getNum()); orderDetail.setReturnNum(orderDetail.getNum());
orderDetail.setStatus(OrderStatusEnums.CANCELLED.getCode()); orderDetail.setStatus(OrderStatusEnums.CANCELLED.getCode());
} }