Merge branch 'dev' into prod

扣除积分 负数

cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java

@@ -41,6 +41,7 @@ public class OrderDetailSmallVO implements Serializable {
     private LocalDateTime startOrderTime;
     private LocalDateTime dishOutTime;
     private LocalDateTime foodServeTime;
+    private Integer isTemporary;
 
 }
 

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserServiceImpl.java

@@ -192,7 +192,7 @@ public class MkPointsUserServiceImpl extends ServiceImpl<MkPointsUserMapper, MkP
                 .shopId(pointsUser.getShopId())
                 .shopUserId(pointsUser.getShopUserId())
                 .floatType(PointsConstant.SUB.getValue())
-                .floatPoints(floatPoints)
+                .floatPoints(-floatPoints)
                 .balancePoints(pointsUser.getPointBalance())
                 .sourceId(orderId.toString())
                 .content(reason)