zoujiajian 2 年 前
コミット
f7904b0a06

+ 2 - 2
netflix-dao/src/main/java/com/cyksj/model/views/RefundOrderDonServiceDataView.java

@@ -21,9 +21,9 @@ public class RefundOrderDonServiceDataView {
 	@DbField("rd.operator")
 	private String operator;
 
-	@DbField("count(rd.orders)")
+	@DbField("count(rd.order_id)")
 	private Integer orders;
 
-	@DbField("if()sum(rd.refund_fee)/100")
+	@DbField("sum(rd.refund_fee)/100")
 	private BigDecimal refundMoney;
 }

+ 9 - 4
netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -16,6 +16,7 @@ import com.cyksj.common.util.IoKit;
 import com.cyksj.common.util.Xmls;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.BusinessType;
+import com.cyksj.enums.GatewayApiCode;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.GoodsDonSkuMapper;
 import com.cyksj.mapper.GroupsRelationMapper;
@@ -586,8 +587,10 @@ public class CmsOrderController {
 	@Log(module = "订单管理/统一退款", businessType = BusinessType.PUT, isSaveRequestData = true)
 	public Result<String> unifiedRefund(@RequestBody @Validated OrderRefundReq refundReq) throws Exception {
 		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);
 		return GatewayResponse.SUCCESS.newBuilder().toResult("退款成功");
 	}
@@ -688,8 +691,10 @@ public class CmsOrderController {
 	@Log(module = "订单管理/订单补差价", businessType = BusinessType.PUT, isSaveRequestData = true)
 	public Result<String> refundPriceDiffer(@RequestBody OrderRefundReq orderRefundReq) throws Exception {
 		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);
 		return GatewayResponse.SUCCESS.newBuilder().toResult();
 	}