Merge branch 'dev' of http://172.16.90.250:3000/cqcarbon/carbon-platform into dev

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/config/mq/listener/ReceiverMessage.java

@@ -26,12 +26,13 @@ public class ReceiverMessage {
         System.out.println("接受时间:" + System.currentTimeMillis());
         System.out.println("接受消息:" + content);
         String[] split = content.split("-");
-        if(split.length>1){
+        if (split.length > 1) {
             String orderId = split[1];
             GoodsOrderInfo goodsOrderInfo = orderInfoService.selectByPrimaryKey(orderId);
-            if(!StringUtils.isEmpty(goodsOrderInfo)){
+            if (!StringUtils.isEmpty(goodsOrderInfo)) {
                 Integer orderStatus = goodsOrderInfo.getOrderStatus();
-                if(orderStatus.intValue() ==1){
+                Integer state = goodsOrderInfo.getState();
+                if (orderStatus.intValue() == 1 && state.intValue() == 1) {
                     orderInfoService.rollbackOrderInfo(orderId);
                     System.out.println("取消订单:" + content);
                 }

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/service/impl/OrderInfoServiceImpl.java

@@ -344,7 +344,14 @@ public class OrderInfoServiceImpl implements OrderInfoService {
     @Override
     public int rollbackOrderInfo(String orderId) {
         GoodsOrderInfo goodsOrderInfo = goodsOrderInfoMapper.selectByPrimaryKey(orderId);
-        goodsOrderInfo.setOrderStatus(6);
+        Integer orderStatus = goodsOrderInfo.getOrderStatus();
+        if(orderStatus.intValue() !=1){
+            throw new RuntimeException("该订单已支付款订单无法取消!");
+        }
+        Integer state = goodsOrderInfo.getState();
+        if(state.intValue() ==0){
+            throw new RuntimeException("该订单为无效订单!");
+        }
         goodsOrderInfo.setState(0);
         goodsOrderInfo.setModifiedTime(new Date());
         int i = goodsOrderInfoMapper.updateByPrimaryKeySelective(goodsOrderInfo);