|
@@ -16,6 +16,7 @@ import com.cyksj.common.util.IoKit;
|
|
|
import com.cyksj.common.util.Xmls;
|
|
import com.cyksj.common.util.Xmls;
|
|
|
import com.cyksj.dto.Result;
|
|
import com.cyksj.dto.Result;
|
|
|
import com.cyksj.enums.BusinessType;
|
|
import com.cyksj.enums.BusinessType;
|
|
|
|
|
+import com.cyksj.enums.GatewayApiCode;
|
|
|
import com.cyksj.enums.GatewayResponse;
|
|
import com.cyksj.enums.GatewayResponse;
|
|
|
import com.cyksj.mapper.GoodsDonSkuMapper;
|
|
import com.cyksj.mapper.GoodsDonSkuMapper;
|
|
|
import com.cyksj.mapper.GroupsRelationMapper;
|
|
import com.cyksj.mapper.GroupsRelationMapper;
|
|
@@ -586,8 +587,10 @@ public class CmsOrderController {
|
|
|
@Log(module = "订单管理/统一退款", businessType = BusinessType.PUT, isSaveRequestData = true)
|
|
@Log(module = "订单管理/统一退款", businessType = BusinessType.PUT, isSaveRequestData = true)
|
|
|
public Result<String> unifiedRefund(@RequestBody @Validated OrderRefundReq refundReq) throws Exception {
|
|
public Result<String> unifiedRefund(@RequestBody @Validated OrderRefundReq refundReq) throws Exception {
|
|
|
long adminId = StpUtil.getLoginIdAsLong();
|
|
long adminId = StpUtil.getLoginIdAsLong();
|
|
|
- Optional.ofNullable(cmsUserMapper.selectById(adminId))
|
|
|
|
|
- .ifPresent(cu -> refundReq.setOperator(cu.getNickname()));
|
|
|
|
|
|
|
+ CmsUser cmsUser = cmsUserMapper.selectById(adminId);
|
|
|
|
|
+ if (cmsUser == null) {
|
|
|
|
|
+ throw BusinessRuntimeException.getGatewayApiCode(GatewayApiCode.CMS_TOKEN_VALID);
|
|
|
|
|
+ }
|
|
|
cmsOrderDonService.unifiedRefund(refundReq);
|
|
cmsOrderDonService.unifiedRefund(refundReq);
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult("退款成功");
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult("退款成功");
|
|
|
}
|
|
}
|
|
@@ -688,8 +691,10 @@ public class CmsOrderController {
|
|
|
@Log(module = "订单管理/订单补差价", businessType = BusinessType.PUT, isSaveRequestData = true)
|
|
@Log(module = "订单管理/订单补差价", businessType = BusinessType.PUT, isSaveRequestData = true)
|
|
|
public Result<String> refundPriceDiffer(@RequestBody OrderRefundReq orderRefundReq) throws Exception {
|
|
public Result<String> refundPriceDiffer(@RequestBody OrderRefundReq orderRefundReq) throws Exception {
|
|
|
long adminId = StpUtil.getLoginIdAsLong();
|
|
long adminId = StpUtil.getLoginIdAsLong();
|
|
|
- Optional.ofNullable(cmsUserMapper.selectById(adminId))
|
|
|
|
|
- .ifPresent(cu -> orderRefundReq.setOperator(cu.getNickname()));
|
|
|
|
|
|
|
+ CmsUser cmsUser = cmsUserMapper.selectById(adminId);
|
|
|
|
|
+ if (cmsUser == null) {
|
|
|
|
|
+ throw BusinessRuntimeException.getGatewayApiCode(GatewayApiCode.CMS_TOKEN_VALID);
|
|
|
|
|
+ }
|
|
|
cmsOrderDonService.refundPriceDiffer(orderRefundReq);
|
|
cmsOrderDonService.refundPriceDiffer(orderRefundReq);
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult();
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult();
|
|
|
}
|
|
}
|