diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java index 9057d4da0..17b15165d 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; * @since 2025-12-08 */ @Service -public class SysRoleTemplateServiceImpl extends ServiceImpl implements SysRoleTemplateService{ +public class SysRoleTemplateServiceImpl extends ServiceImpl implements SysRoleTemplateService { @Resource private SysRoleService roleService; @@ -44,7 +44,7 @@ public class SysRoleTemplateServiceImpl extends ServiceImpl listInfo(Long pid) { - QueryWrapper queryWrapper = new QueryWrapper().eq(SysRoleTemplate::getPid, pid); + QueryWrapper queryWrapper = new QueryWrapper().eq(SysRoleTemplate::getPid, pid).orderBy(SysRoleTemplate::getSort, false); List list = list(queryWrapper); // 转成 map,便于通过 id 找节点 diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PointsGoodPayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PointsGoodPayServiceImpl.java index a0756ed8b..dbb324b23 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PointsGoodPayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PointsGoodPayServiceImpl.java @@ -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> result = CzgResult.success(); + CzgResult> mapCzgResult = payService.ltPayPointsGoods(ip, param, record.getId()); + if (200 != mapCzgResult.getCode()) { + return mapCzgResult; + } + Map 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());