修改bug

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java

@@ -6,6 +6,7 @@ import java.util.Date;
 import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import tk.mybatis.mapper.annotation.Version;
 
 
 /**
@@ -206,7 +207,7 @@ public class BaseOrder implements Serializable {
     /**
      * 乐观锁,修改版本号
      */
-    @Version
     @ApiModelProperty(value = "乐观锁,修改版本号")
+    @Version
     private Integer version;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java

@@ -9,10 +9,19 @@ import java.util.Map;
 
 @Data
 public class OrderPageVO extends BaseOrder {
+    public static final String TYPE = "type=";
+    public static final String NO = "no=";
+
     OrderRentVehicleDetail orderRentVehicleDetail;
     OrderTourDetail orderTourDetail;
 
     private String username;
 
     private String vehicalNumberPlat;
+
+    private String qrcodeStr;
+
+    public void setQrcodeStr(String prefix) {
+        this.qrcodeStr = prefix+ "?"+ TYPE+ getType()+ "&"+ NO+ getNo();
+    }
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -190,10 +190,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
 
         if (OrderStatusEnum.ORDER_UNPAY.getCode().equals(baseOrder.getStatus()) && baseOrder.getHasPay().equals(SYS_FALSE)) {
             BaseOrder updateOrder = new BaseOrder() {{
-                setNo(orderNo);
+                setId(baseOrder.getId());
                 setOutTradeNo(tradeNo);
                 setHasPay(SYS_TRUE);
                 setPayTime(System.currentTimeMillis());
+                setVersion(baseOrder.getVersion());
             }};
 
             //如果是会员订单，则触发会员效益
@@ -233,7 +234,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                 //站点总人数添加
                  tourFeign.updateTourGoodPersonNum(otd.getVerificationId(), TourFeign.TOTAL_PERSON, otd.getTotalNumber());
             }
-            this.updateSelectiveById(updateOrder);
+            this.updateSelectiveByIdRe(updateOrder);
         } else {
             log.error(" order has payed , orderNo:{}, tradeNo:{} ", orderNo, tradeNo);
         }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -72,8 +72,12 @@ public class BaseOrderController extends CommonBaseController {
 
     @Value("${gateway.host}")
     String host;
+
     @Value("${gateway.order}")
     String order;
+
+
+    String qrcodePrefix = "fcwx://order";
     String notifyUrl = "/baseOrder/app/unauth/notifyUrl";
 
     @RequestMapping(value = "/page", method = RequestMethod.GET)
@@ -87,7 +91,9 @@ public class BaseOrderController extends CommonBaseController {
         }
         dto.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
         Query query = new Query(dto);
-        return new ObjectRestResponse<>().data(PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper())));
+        PageDataVO<OrderPageVO> pages = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
+        pages.getData().parallelStream().forEach(data -> data.setQrcodeStr(qrcodePrefix));
+        return new ObjectRestResponse<>().data(pages);
     }
 
     @RequestMapping(value = "/getOrderList", method = RequestMethod.GET)

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java

@@ -21,6 +21,8 @@ import java.math.BigDecimal;
 @Transactional
 public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends OrderDetail>{
 
+    public static final int VERSION_INITIAL = 0;
+
     @Autowired
     protected Biz detailBiz;
 
@@ -49,6 +51,9 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
         //设置订单状态
         baseOrder.setStatus(OrderStatusEnum.ORDER_CRT.getCode());
 
+        //设置初始版本号
+        baseOrder.setVersion(VERSION_INITIAL);
+
         //设置用户id
         baseOrder.setUserId(Integer.valueOf(BaseContextHandler.getUserID()));
         return baseOrder;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderTourService.java

@@ -156,7 +156,6 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
             detail.setTotalNumber(detail.getAdultNum() + detail.getChildNum());
         }
 
-
         //计算旅游价格
         ObjectRestResponse<TourSpePriceVo> objectRestResponse = tourFeign.refund(new TourSpePriceDTO(){{
             setChildNumber(detail.getChildNum());