券核销接口字段添加

order-application-service/src/main/java/cn/freemud/entities/dto/CouponCodeVerificationDto.java

@@ -40,8 +40,23 @@ public class CouponCodeVerificationDto extends CouponCodeBaseDto {
     private String memberId;
 
     /**
+     * 订单金额：订单总金额（未使用优惠时）
+     */
+    private Long orderTotalAmount;
+
+    /**
+     * 实付金额：支付时的合计金额
+     */
+    private Long orderPaymentAmount;
+
+    /**
+     * 优惠金额：餐饮订单中的【商家优惠】金额
+     */
+    private Long orderDiscountAmount;
+
+    /**
      * 核销交易信息
      */
     private List<CouponCodeVerificationTransDto> transactions;
 
-}
+}
\ No newline at end of file

order-application-service/src/main/java/cn/freemud/entities/dto/QueryOrdersResponseDto.java

@@ -74,6 +74,12 @@ public class QueryOrdersResponseDto {
              * 总金额
              */
             private Long amount;
+
+            /**
+             * 订单原始金额，单位分
+             */
+            private BigDecimal originalAmount;
+
             /**
              * 吧台桌号
              */
@@ -514,6 +520,9 @@ public class QueryOrdersResponseDto {
                  * 自定义对象
                  */
                 private String addInfo;
+
+                //商家优惠
+                private Long shopDiscountAmount;
             }
         }
     }

order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java

@@ -98,6 +98,9 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
                     || OrderAccountType.PRODUCT_COUPON.getCode().equals(accountBean.getType())
                     || OrderAccountType.DISCOUNT_COUPON.getCode().equals(accountBean.getType())) {
                 CouponCodeVerificationDto couponCodeVerificationDto = couponAdapter.convert2CouponCodeVerificationDto(activityChannelEnum, accountBean.getAccountId(), orderBean.getOid(), orderBean.getCompanyId(), orderBean.getShopId(), orderBean.getUserId(), products, accountBean.getPrice().intValue(),couponReqType);
+                couponCodeVerificationDto.setOrderTotalAmount(orderBean.getAmount());
+                couponCodeVerificationDto.setOrderPaymentAmount(orderBean.getOriginalAmount()==null ? 0L: orderBean.getOriginalAmount().longValue());
+                couponCodeVerificationDto.setOrderDiscountAmount(accountList.stream().mapToLong(account->account.getShopDiscountAmount()==null?0L:account.getShopDiscountAmount()).sum());
                 // 核销券新增参数：组织机构ID
                 couponCodeVerificationDto.setChannel_codes(storeService.getOrgIdsArr(orderBean.getCompanyId(), orderBean.getShopId()));
                 try {