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

成团人数

Browse Source
This commit is contained in:
wangw
2025-12-17 15:24:20 +08:00
parent 50f03430f2
commit 20610bf456
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbOrderDetailVO.java
View File

@@ -29,6 +29,10 @@ public class GbOrderDetailVO extends GbOrderDetail {
* 店铺名称
*/
private String shopName;
/**
* 要求成团人数
*/
private Integer groupPeopleNum;
/**
* 店铺地址
*/

2
cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java
View File

@@ -18,7 +18,7 @@ public interface GbOrderMapper extends BaseMapper<GbOrder> {
List<GbOrderDetailVO> getGbOrderPage(GbOrderQueryParam param, Long shopId, Long mainShopId);
GbOrderDetailVO getGbOrderDetail(Long shopId, Long detailId);
GbOrderDetailVO getGbOrderDetail(Long mainShopId, Long shopId, Long detailId);
List<GbOrderUserVO> getGbOrderDetailUsers(Long mainShopId, Long shopId, String groupOrderNo);
}

2
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java
View File

@@ -101,7 +101,7 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
@Override
public GbOrderDetailVO getGoodsRecordDetail(Long shopId, Long detailId) {
Long mainIdByShopId = shopInfoService.getMainIdByShopId(shopId);
GbOrderDetailVO gbOrderDetail = mapper.getGbOrderDetail(shopId, detailId);
GbOrderDetailVO gbOrderDetail = mapper.getGbOrderDetail(mainIdByShopId, shopId, detailId);
AssertUtil.isNull(gbOrderDetail, "记录不存在");
List<GbOrderUserVO> users = mapper.getGbOrderDetailUsers(mainIdByShopId, shopId, gbOrderDetail.getGroupOrderNo());
gbOrderDetail.setUsers(users);

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

@@ -28,7 +28,6 @@ import com.czg.market.vo.MkShopRechargeVO;
import com.czg.order.dto.CheckOrderPay;
import com.czg.order.dto.LtPayOtherDTO;
import com.czg.order.dto.OrderInfoRefundDTO;
import com.czg.order.dto.PointGoodsExchangeDTO;
import com.czg.order.entity.OrderDetail;
import com.czg.order.entity.OrderInfo;
import com.czg.order.entity.OrderPayment;
@@ -630,7 +629,7 @@ public class PayServiceImpl implements PayService {
}
String refPayOrderNo = "REFVIP" + IdUtil.getSnowflakeNextId();
refPaymentId = initOrderPayment(new OrderPayment(refPayParam.getShopId(), shopUser.getId(),
"memberRefund", refPayOrderNo, null, refPayParam.getRefAmount()));
PaymentPayTypeEnum.MEMBER_REFUND.getValue(), refPayOrderNo, null, refPayParam.getRefAmount()));
CzgResult<CzgRefundResp> refund = refund(refPayParam.getShopId(), new CzgRefundReq(refPayOrderNo, refPayParam.getRemark(),
refPayParam.getRefAmount().multiply(MONEY_RATE).longValue(), payment.getOrderNo(), ""));
if (refund.getCode() != 200 || refund.getData() == null || !"SUCCESS".equals(refund.getData().getState())) {
@@ -825,7 +824,7 @@ public class PayServiceImpl implements PayService {
@NonNull String refundReason, @NonNull BigDecimal refundAmount) {
OrderPayment payment = paymentService.getById(payOrderId);
AssertUtil.isNull(payment, "退款失败支付记录不存在");
Long refundId = initOrderPayment(new OrderPayment(shopId, orderId, "refund", refPayOrderNo, null, refundAmount, payment.getId()));
Long refundId = initOrderPayment(new OrderPayment(shopId, orderId, PaymentPayTypeEnum.REFUND.getValue(), refPayOrderNo, null, refundAmount, payment.getId()));
CzgResult<CzgRefundResp> refund = refund(shopId, new CzgRefundReq(refPayOrderNo, refundReason, refundAmount.multiply(MONEY_RATE).longValue(),
payment.getOrderNo(), ""));
if (refund.getCode() != 200 || refund.getData() == null || !"SUCCESS".equals(refund.getData().getState())) {
@@ -849,7 +848,7 @@ public class PayServiceImpl implements PayService {
@NonNull String refundReason, @NonNull BigDecimal refundAmount) {
OrderPayment payment = paymentService.getById(payOrderId);
AssertUtil.isNull(payment, "退款失败,支付记录不存在");
Long refundId = initOrderPayment(new OrderPayment(shopId, sourceId, "refund", refPayOrderNo, null, refundAmount, payment.getId()));
Long refundId = initOrderPayment(new OrderPayment(shopId, sourceId, PaymentPayTypeEnum.REFUND.getValue(), refPayOrderNo, null, refundAmount, payment.getId()));
CzgResult<CzgRefundResp> refund = refund(shopId, new CzgRefundReq(refPayOrderNo, refundReason, refundAmount.multiply(MONEY_RATE).longValue(),
payment.getOrderNo(), ""));
OrderPayment uOrderPayment = new OrderPayment();

4
cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
View File

@@ -6,8 +6,8 @@
<select id="getGbOrderPage" resultType="com.czg.order.vo.GbOrderDetailVO">
SELECT
detail.* ,`order`.ware_json as wareJson,`order`.group_end_time as groupEndTime,`user`.nick_name as userName,
`user`.phone as userPhone,shop.shop_name as shopName,shop.address as shopAddress
detail.* ,`order`.ware_json as wareJson,`order`.group_end_time as groupEndTime,`order`.group_people_num as groupPeopleNum
,`user`.nick_name as userName,`user`.phone as userPhone,shop.shop_name as shopName,shop.address as shopAddress
FROM
`gb_order_detail` detail
LEFT JOIN gb_order `order` on detail.group_order_no = `order`.group_order_no and `order`.shop_id = #{shopId}