cancel order dev;

share-front/src/main/java/share/web/controller/system/SOrderController.java

@@ -14,7 +14,6 @@ import share.common.core.domain.R;
 import share.common.core.redis.RedisUtil;
 import share.common.utils.JsonConvertUtil;
 import share.system.domain.SOrder;
-import share.system.domain.vo.MyRecord;
 import share.system.request.CreateOrderRequest;
 import share.system.request.OrderComputedPriceRequest;
 import share.system.response.ComputedOrderPriceResponse;
@@ -22,6 +21,8 @@ import share.system.response.OrderPayResultResponse;
 import share.system.service.ISOrderService;
 import share.common.core.page.TableDataInfo;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 订单Controller
  * 
@@ -86,6 +87,15 @@ public class SOrderController extends BaseController
         return R.ok(response);
     }
 
+    /**
+     * 取消订单
+     */
+    @ApiOperation(value = "取消订单")
+    @RequestMapping(value = "/cancel", method = RequestMethod.POST)
+    public R<Boolean> cancel(@RequestBody @Validated @NotBlank(message = "订单编号不能为空") String orderNo) {
+        return R.ok(sOrderService.cancel(orderNo));
+    }
+
 
     /**
      * 根据参数计算订单价格

share-system/src/main/java/share/system/service/ISOrderService.java

@@ -5,7 +5,6 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import share.system.domain.SOrder;
-import share.system.domain.vo.MyRecord;
 import share.system.request.CreateOrderRequest;
 import share.system.request.OrderComputedPriceRequest;
 import share.system.request.OrderRefundRequest;
@@ -116,4 +115,11 @@ public interface ISOrderService extends IService<SOrder>
      * @return
      */
     List<SOrder> validOrder();
+
+    /**
+     * 取消订单
+     * @param orderNo
+     * @return
+     */
+    boolean cancel(String orderNo);
 }

share-system/src/main/java/share/system/service/impl/CallbackServiceImpl.java

@@ -163,7 +163,6 @@ public class CallbackServiceImpl implements CallbackService {
                         sb.append("</xml>");
                         return sb.toString();
                     }
-                    redisUtil.lPush(Constants.ORDER_TASK_PAY_SUCCESS_AFTER, sOrder.getOrderNo());
                     sb.append("<return_code><![CDATA[SUCCESS]]></return_code>");
                     sb.append("<return_msg><![CDATA[OK]]></return_msg>");
                     break;

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -367,6 +367,18 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper,SOrder> implemen
     }
 
     @Override
+    public boolean cancel(String orderNo) {
+        SOrder order = getByOrderNo(orderNo);
+        if(Objects.isNull(order)){
+            throw new BaseException("订单不存在！");
+        }
+        order.setStatus(OrderStatusEnum.CANCEL.getCode());
+        order.setRefundStatus(RefundStatusEnum.APPLY.getCode());
+        updateById(order);
+        return true;
+    }
+
+    @Override
     public String openDoor(Long id) {
         SOrder sOrder = sOrderMapper.selectSOrderById(id);
         if (Objects.isNull(sOrder)) {