czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

取餐码获取修改

Browse Source 
退款接口完善
This commit is contained in:
SongZhang
2024-10-09 14:54:56 +08:00
parent 37dc169607
commit fece3c274e
8 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/PayServiceImpl.java
View File

@@ -46,7 +46,7 @@ public class PayServiceImpl implements PayService {
private String gateWayUrl;
@Value("${thirdPay.url}")
private String url;
@Value("${thirdPay.callBack}")
@Value("${thirdPay.notify.fstReturn}")
private String callBack;
private final RestTemplate restTemplate;

7
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
View File

@@ -571,4 +571,11 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
rabbitMsgUtils.addBalanceRecord(baObj);
// producer.balance(baObj.toString());
}
@Override
public void successPay(Map<String, String> req) {
if ("000000".equals(req.get("code"))) {
}
}
}

15
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -981,7 +981,15 @@ public class TbShopTableServiceImpl implements TbShopTableService {
private final StringRedisTemplate redisTemplate;
@Override
public JSONObject getMasterId(Integer shopId, String tableId, String useType) {
public JSONObject getMasterId(Integer shopId, String tableId, String useType, Integer orderId) {
if (orderId != null) {
TbOrderInfo orderInfo = orderInfoMapper.selectById(orderId);
if (orderInfo != null) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("masterId", orderInfo.getMasterId());
return jsonObject;
}
}
String account = tokenProvider.getSubject();
if (account == null) {
throw new BadRequestException("token解析失败");
@@ -1656,7 +1664,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
@Override
public Object choseTable(ChoseTableDTO choseTableDTO) {
String masterId = getMasterId(choseTableDTO.getShopId(), choseTableDTO.getNewTableId(), null).getString("masterId");
String masterId = getMasterId(choseTableDTO.getShopId(), choseTableDTO.getNewTableId(), null, null).getString("masterId");
TbShopTable shopTable = mpShopTableMapper.selectOne(new LambdaQueryWrapper<TbShopTable>()
.eq(TbShopTable::getQrcode, choseTableDTO.getNewTableId())
@@ -2036,6 +2044,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderInfoService.depositReturn(Integer.valueOf(orderInfo.getUserId()), Integer.valueOf(orderInfo.getShopId()), returnOrderInfo.getRefundAmount());
}
orderInfo.setStatus("refund");
orderInfoMapper.updateById(orderInfo);
// 打印退款小票
// producer.printMechine(newOrderInfo.getId().toString());

5
eladmin-system/src/main/java/cn/ysk/cashier/service/order/TbOrderInfoService.java
View File

@@ -97,4 +97,9 @@ public interface TbOrderInfoService {
*/
void depositReturn(Integer userId, Integer shopId, BigDecimal returnAmount);
/**
* 支付回调
* @param req
*/
void successPay(Map<String, String> req);
}

2
eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
View File

@@ -112,7 +112,7 @@ public interface TbShopTableService {
Object createOrder(CreateOrderDTO createOrderDTO, boolean addMasterId, boolean isPrint);
JSONObject getMasterId(Integer shopId, String tableId, String useType);
JSONObject getMasterId(Integer shopId, String tableId, String useType, Integer orderId);
Object pending(PendingDTO pendingDTO);