Merge branch 'prod'

cash-common/cash-common-service/src/main/java/com/czg/account/dto/user/userinfo/UserInfoAssetsSummaryDTO.java

@@ -16,7 +16,7 @@ public class UserInfoAssetsSummaryDTO {
     /**
      * 总积分
      */
-    private Integer points;
+    private Integer accountPoints;
     /**
      * 可使用优惠券数量
      */

cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderCannelDTO.java

@@ -0,0 +1,17 @@
+package com.czg.order.dto;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * @author ww
+ * @description
+ */
+@Data
+public class OrderCannelDTO {
+    @NotNull(message = "店铺ID不可为空")
+    private Long shopId;
+    @NotNull(message = "订单ID不可为空")
+    private Long orderId;
+    private Integer placeNum;
+}

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

@@ -58,4 +58,10 @@ public interface OrderInfoService extends IService<OrderInfo> {
 
     Boolean printOrder(Long shopId, OrderInfoPrintDTO orderInfoPrintDTO);
 
+
+    Boolean removeOrderDetail(Long shopId, Long orderId, Long detailId);
+
+    Boolean cancelledOrder(Long shopId, Long orderId);
+
+    Boolean cancelledPlaceOrder(Long shopId, Long orderId, Integer placeNum);
 }

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

@@ -15,4 +15,5 @@ import java.util.Map;
 @Data
 public class HistoryOrderPrintVo extends OrderInfo {
     private Map<String, List<OrderDetailPrintVo>> detailMap;
+    private long orderNum;
 }