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-11 10:38:23 +08:00
parent 304e4383dc
commit 6a894a5cc2
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java
View File

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
* @since 2025-12-08
*/
@Service
public class SysRoleTemplateServiceImpl extends ServiceImpl<SysRoleTemplateMapper, SysRoleTemplate> implements SysRoleTemplateService{
public class SysRoleTemplateServiceImpl extends ServiceImpl<SysRoleTemplateMapper, SysRoleTemplate> implements SysRoleTemplateService {
@Resource
private SysRoleService roleService;
@@ -44,7 +44,7 @@ public class SysRoleTemplateServiceImpl extends ServiceImpl<SysRoleTemplateMappe
@Override
public List<SysRoleTemplate> listInfo(Long pid) {
QueryWrapper queryWrapper = new QueryWrapper().eq(SysRoleTemplate::getPid, pid);
QueryWrapper queryWrapper = new QueryWrapper().eq(SysRoleTemplate::getPid, pid).orderBy(SysRoleTemplate::getSort, false);
List<SysRoleTemplate> list = list(queryWrapper);
// 转成 map，便于通过 id 找节点

13
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PointsGoodPayServiceImpl.java
View File

@@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.Map;
/**
@@ -100,7 +101,16 @@ public class PointsGoodPayServiceImpl implements PointsGoodPayService {
record.setStatus("待支付");
record.setIsDel(1);
goodsRecordService.save(record);
return payService.ltPayPointsGoods(ip, param, record.getId());
CzgResult<Map<String, Object>> result = CzgResult.success();
CzgResult<Map<String, Object>> mapCzgResult = payService.ltPayPointsGoods(ip, param, record.getId());
if (200 != mapCzgResult.getCode()) {
return mapCzgResult;
}
Map<String, Object> resultMap = new HashMap<>(2);
resultMap.put("payInfo", mapCzgResult.getData());
resultMap.put("goodsRecord", record);
result.setData(resultMap);
return result;
}
//正常处理
@@ -155,6 +165,7 @@ public class PointsGoodPayServiceImpl implements PointsGoodPayService {
ShopCoupon coupon = shopCouponService.getById(goods.getCouponId());
if (coupon != null) {
record.setCouponJson(JSONObject.toJSONString(coupon));
record.fillCouponInfo();
}
record.setStatus("已完成");
record.setCheckoutTime(LocalDateTime.now());