From 3401ad3b3a699879471af7c81f994b1dd172ab38 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 27 May 2021 17:00:23 +0800 Subject: [PATCH] tt --- .../com/iformall/domain/po/tt/TtOrder.java | 6 +- .../com/iformall/mapper/TtOrderMapper.java | 2 + .../iformall/service/tt/TtOrderService.java | 4 + .../service/tt/impl/TtOrderServiceImpl.java | 9 ++ .../main/resources/mapper/TtOrderMapper.xml | 100 ++++++++++++++++-- .../controller/TtOrderController.java | 2 +- 6 files changed, 111 insertions(+), 12 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtOrder.java index 261c42357..c1ec80e31 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtOrder.java @@ -28,12 +28,10 @@ public class TtOrder extends TenantEntity { private String phone; @io.swagger.annotations.ApiModelProperty(value="产品ID(couponId)",name="productId") private Long productId; - @TableField(exist = false) private String productTitle; - @TableField(exist = false) private String productPic; - @TableField(exist = false) - private Long authorId; + private Integer productSalePrice; + private Long merchantId; @TableField(exist = false) private String author; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/mapper/TtOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/TtOrderMapper.java index b16fde7c9..80a69c816 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/TtOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/TtOrderMapper.java @@ -16,5 +16,7 @@ public interface TtOrderMapper extends CommonMapper { List findList(TtOrder record); + List findCList(TtOrder record); + Integer findListCount(TtOrder orderQ); } diff --git a/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java b/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java index 7e7141cf6..dfc24301d 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java @@ -1,6 +1,7 @@ package com.iformall.service.tt; import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.dto.OrderSaveDto; import com.iformall.domain.po.WxAppinfo; @@ -20,6 +21,7 @@ public interface TtOrderService { * @return */ PageInfo listAsPage(TtOrder record, Integer pageIndex, Integer pageSize); + PageInfo listCAsPage(TtOrder order, Integer pageNum, Integer pageSize); ResultData saveOrder(Long couponId, Long memberId, EnumPayWay payWay, TenantEntity tenantInfo); @@ -32,4 +34,6 @@ public interface TtOrderService { ResultData updateOrderStatus(Long orderId, WxAppinfo cAppInfo, WxPayAccount payAccount); boolean isByMember(Long memberId, Long id); + + } diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java index 237b168e5..513fd1dd1 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java @@ -61,6 +61,11 @@ public class TtOrderServiceImpl implements TtOrderService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> ttOrderMapper.findList(record)); } + @Override + public PageInfo listCAsPage(TtOrder record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> ttOrderMapper.findCList(record)); + } + @Override public ResultData saveOrder(Long couponId,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity) { logger.info("OrderSave: couponId:" + couponId + "---cUserId:"+cUserId); @@ -107,6 +112,10 @@ public class TtOrderServiceImpl implements TtOrderService { order.updateTenantInfo(tenantEntity); order.setCUserId(cUserId); order.setProductId(coupon.getId()); + order.setProductTitle(coupon.getTitle()); + order.setProductPic(coupon.getCoverImg()); + order.setProductSalePrice(coupon.getSalePrice()); + order.setMerchantId(coupon.getMerchantId()); order.setType(payWay.getCode()); order.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); order.setPayment(coupon.getSalePrice()); diff --git a/mallinkService/src/main/resources/mapper/TtOrderMapper.xml b/mallinkService/src/main/resources/mapper/TtOrderMapper.xml index 63d596358..5a9e752d1 100644 --- a/mallinkService/src/main/resources/mapper/TtOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/TtOrderMapper.xml @@ -7,6 +7,11 @@ + + + + + @@ -18,8 +23,6 @@ - - @@ -28,7 +31,7 @@ o.`id`,o.`tenant_id`,o.`parent_tenant_id`,o.`c_user_id`,o.`product_id`,o.`type`,o.`way`,o.`payment_type`,o.`payment`, o.`payment_time`,o.`order_status`,o.`create_date`,o.`update_date`, u.`nick_name`,u.`phone`, - c.`title` product_title,c.`cover_img` product_pic, + o.`product_title`,o.`product_pic`,o.`product_sale_price`, m.`name` author,m.`img_url` author_pic @@ -86,11 +89,11 @@ - and c.`title` like concat('%', #{productTitle},'%') + and o.`title` like concat('%', #{productTitle},'%') - and c.merchant_id = #{authorId} + and o.merchant_id = #{authorId} @@ -118,11 +121,94 @@ from tt_order o left join tt_c_user u on o.c_user_id = u.id - left join tt_coupon c on o.product_id = c.id - left join wx_merchant m on c.merchant_id = m.id + left join wx_merchant m on o.merchant_id = m.id + + + + o.`id`,o.`tenant_id`,o.`parent_tenant_id`,o.`c_user_id`,o.`product_id`,o.`type`,o.`way`,o.`payment_type`,o.`payment`, + o.`payment_time`,o.`order_status`,o.`create_date`,o.`update_date`, + o.`product_title`,o.`product_pic`,o.`product_sale_price`, + m.`name` author,m.`img_url` author_pic + + + + where 1 = 1 + + + and o.`id` = #{id} + + + + and o.`tenant_id` = #{tenantId} + + + and o.`parent_tenant_id` = #{parentTenantId} + + + + and o.`c_user_id` = #{cUserId} + + + + and o.`product_id` = #{productId} + + + + and o.`type` = #{type} + + + + and o.`way` = #{way} + + + + and o.`payment_type` = #{paymentType} + + + + and o.`payment_time` >= #{startdate} + + + and o.`payment_time` <= #{enddate} + + + + and o.`order_status` = #{orderStatus} + + + + and o.merchant_id = #{authorId} + + + + and m.`name` like concat('%', #{author},'%') + + + + and o.`order_status` in + + #{sItem} + + + + + and o.`id` in + + #{idItem} + + + order by o.`update_date` desc + +