Browse Source

问题修改

liweifan 3 years ago
parent
commit
c71591d91b

+ 13 - 0
cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserOrderRefundController.java

@@ -73,4 +73,17 @@ public class UserOrderRefundController extends BaseController {
 		}
 		return userOrderRefundService.orderRefund(orderNo, reason);
 	}
+
+	@PostMapping("/orderRefundSuccessBizHandle")
+	@ApiOperation(value = "调用退款后处理业务逻辑", notes = "传入authOperaReq")
+	@PreAuthorize("@pcs.hasPermissions('userOrderRefunds/orderRefundSuccessBizHandle')")
+	public HttpResponseResult<UserOrderRefundBill> orderRefundSuccessBizHandle(Long refundId) throws Exception {
+		SysUser user = sysUserFeignService.queryUserInfo();
+		if (user == null || null == user.getId()) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		userOrderRefundService.orderRefundSuccessBizHandle(refundId);
+		return HttpResponseResult.succeed();
+	}
+
 }

+ 2 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/UserOrderRefundService.java

@@ -82,4 +82,6 @@ public interface UserOrderRefundService extends IService<UserOrderRefund>  {
 	 * @param orderNo
 	 */
 	HttpResponseResult<UserOrderRefundBill> orderRefound(String orderNo);
+
+	void orderRefundSuccessBizHandle(Long refundId);
 }

+ 4 - 4
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderRefundServiceImpl.java

@@ -12,7 +12,6 @@ import com.yonge.cooleshow.biz.dal.dto.req.OrderRefundReq;
 import com.yonge.cooleshow.biz.dal.dto.search.OrderDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.UserOrderRefundSearch;
 import com.yonge.cooleshow.biz.dal.entity.*;
-import com.yonge.cooleshow.biz.dal.enums.AccountBizTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.GoodTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.OrderStatusEnum;
@@ -512,7 +511,7 @@ public class UserOrderRefundServiceImpl extends ServiceImpl<UserOrderRefundDao,
 
 
     @Transactional(rollbackFor = Exception.class)
-    HttpResponseResult<UserOrderRefundBill> doOrderRefundTest(UserOrderRefund orderRefund) {
+    public HttpResponseResult<UserOrderRefundBill> doOrderRefundTest(UserOrderRefund orderRefund) {
         UserOrderPayment payment = orderPaymentService.getOne(Wrappers.<UserOrderPayment>lambdaQuery()
                 .eq(UserOrderPayment::getOrderNo, orderRefund.getOrderNo())
                 .eq(UserOrderPayment::getStatus, TradeStatusEnum.succeeded)
@@ -600,10 +599,11 @@ public class UserOrderRefundServiceImpl extends ServiceImpl<UserOrderRefundDao,
      *
      * @param refundId 退款单id
      */
-    private void orderRefundSuccessBizHandle(Long refundId) {
+    @Override
+    public void orderRefundSuccessBizHandle(Long refundId) {
         //处理业务
         UserOrderRefund orderRefund = getById(refundId);
-        if (StringUtil.isEmpty(orderRefund.getOredrDetilIds())) {
+        if (!StringUtil.isEmpty(orderRefund.getOredrDetilIds())) {
             List<Long> ids = new ArrayList<>();
             for (String id : orderRefund.getOredrDetilIds().split(",")) {
                 ids.add(Long.parseLong(id));

+ 1 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderDetailMapper.xml

@@ -77,7 +77,7 @@
         left join user_order o on t.order_no_ = o.order_no_
         <where>
             <if test="param.orderNo != null and param.orderNo != ''">
-                AND t.order_no_ = #{orderNo}
+                AND t.order_no_ = #{param.orderNo}
             </if>
             <if test="param.ids != null and param.ids.size()>0">
                 AND t.id_ IN