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

订单退款方式

This commit is contained in:
wangw 2025-04-08 09:35:07 +08:00
parent f6b4504132
commit 4e9d4b620f
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java
View File

@ -23,7 +23,6 @@ import lombok.NoArgsConstructor;
* @since 2025-02-13
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Table("tb_order_info")
@ -128,6 +127,10 @@ public class OrderInfo implements Serializable {
* 台桌名称
*/
private String tableName;
/**
* 退款方式 现金退款-cash 原路退回-payBack
*/
private String refundType;
/**
* 订单类型-

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

@ -71,6 +71,10 @@ public class OrderInfoVo implements Serializable {
* miniapp小程序
*/
private String orderType;
/**
* 退款方式 现金退款-cash 原路退回-payBack
*/
private String refundType;
/**
* 平台类型 pc 收银机客户端 wechat 微信小程序 alipay 支付宝小程序 admin-pc PC管理端 admin-app APP管理端

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

@ -667,7 +667,9 @@ public class PayServiceImpl implements PayService {
refundOrder(orderInfo.getShopId(), orderInfo.getId(), orderInfo.getPayOrderId(),
refPayOrderNo, StrUtil.isBlank(param.getRefundReason()) ? "退款" : param.getRefundReason(), param.getRefundAmount());
}
orderInfo.setRefundType("payBack");
}
orderInfo.setRefundType("cash");
} else {
orderInfo.setOrderAmount(orderInfo.getOrderAmount().subtract(param.getRefundAmount()));
}

12
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopSyncServiceImpl.java
View File

@ -4,23 +4,17 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.czg.account.entity.ShopInfo;
import com.czg.account.entity.SysRole;
import com.czg.account.service.ShopInfoService;
import com.czg.account.service.SyncNoticeService;
import com.czg.exception.CzgException;
import com.czg.product.entity.*;
import com.czg.product.service.*;
import com.czg.product.vo.ProductGroupVo;
import com.czg.service.product.mapper.ConsInfoMapper;
import com.czg.service.product.mapper.ProdConsRelationMapper;
import com.czg.service.product.mapper.ProdSkuMapper;
import com.czg.utils.AssertUtil;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@ -31,7 +25,6 @@ import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import static com.mybatisflex.core.query.QueryMethods.column;
@ -64,6 +57,8 @@ public class ShopSyncServiceImpl implements ShopSyncService {
private ConsGroupService consGroupService;
@Resource
private ProdConsRelationService prodConsRelationService;
@Resource
private SyncNoticeService syncNoticeService;
private void checkShopInfo(Long sourceShopId, Long targetShopId) {
AssertUtil.isNull(sourceShopId, "{}不能为空", "源店铺ID");
@ -78,6 +73,7 @@ public class ShopSyncServiceImpl implements ShopSyncService {
|| targetShop.getIsHeadShop() == null || targetShop.getIsHeadShop().equals(1)) {
throw new CzgException("同步失败,目标店铺是主店铺或目标店铺是单店");
}
}
@Override