From 0c9521d93a745de0ec71d83c094a6047c0222398 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 29 十月 2025 15:01:51 +0800
Subject: [PATCH] 调整
---
framework/src/main/resources/mapper/lmk/orderMapper.xml | 2
seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java | 7 +
framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewMapper.java | 8 +
framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java | 46 ++++++---
framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java | 4
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 52 ++++++++++
framework/src/main/resources/mapper/lmk/VideoMapper.xml | 137 +++++++++++++++++++++-----
framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java | 2
framework/src/main/java/cn/lili/modules/member/entity/dto/UpdateTracesDTO.java | 27 +++++
framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java | 5
framework/src/main/resources/mapper/lmk/GoodsCustomizeTemplateMapper.xml | 1
framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java | 6
12 files changed, 245 insertions(+), 52 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java
index c94ce90..b2561c6 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java
@@ -1098,7 +1098,10 @@
v.setCommentNum(this.getCommentNum(v.getId(), v.getCommentNum()));
v.setCollectNum(this.getCollectNum(v.getId(), v.getCollectNum()));
v.setThumbsUpNum(this.getThumbsUpNum(v.getId(), v.getThumbsUpNum()));
- v.setAuthorAvatar(cosUtil.getPreviewUrl(v.getAuthorAvatar()));
+ String authorAvatar = v.getAuthorAvatar();
+ if (StringUtils.isNotBlank(authorAvatar)&&!authorAvatar.contains("http")) {
+ v.setAuthorAvatar(cosUtil.getPreviewUrl(authorAvatar));
+ }
if (VideoContentTypeEnum.VIDEO.getValue().equals(v.getVideoContentType())) {
v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverFileKey()));
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/UpdateTracesDTO.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/UpdateTracesDTO.java
new file mode 100644
index 0000000..e7a1a17
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/UpdateTracesDTO.java
@@ -0,0 +1,27 @@
+package cn.lili.modules.member.entity.dto;
+
+import lombok.Data;
+
+@Data
+public class UpdateTracesDTO {
+ /**
+ * 鍖呰９缂栧彿
+ */
+ private String packageNo;
+ /**
+ * 璁㈠崟缂栧彿
+ */
+ private String orderSn;
+ /**
+ * 蹇�掑叕鍙竔d
+ */
+ private String logisticsId;
+ /**
+ * 蹇�掑崟鍙�
+ */
+ private String logisticsNo;
+ /**
+ * 蹇�掔紪鐮�
+ */
+ private String logisticsCode;
+}
diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
index 5a19366..99e248f 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
@@ -4,6 +4,7 @@
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.lmk.domain.vo.OrderCountVO;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
+import cn.lili.modules.member.entity.dto.UpdateTracesDTO;
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dto.*;
@@ -17,6 +18,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -216,6 +218,8 @@
*/
Traces getTraces(String orderSn);
+ void updateTraces(@RequestBody UpdateTracesDTO updateTracesDTO);
+
/**
* 鑾峰彇鍦板浘鐗� 鐗╂祦韪抗
*
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index de80017..38fc343 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -35,6 +35,7 @@
import cn.lili.modules.lmk.mapper.LmkOrderSelectMapper;
import cn.lili.modules.lmk.service.CouponVirtualService;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
+import cn.lili.modules.member.entity.dto.UpdateTracesDTO;
import cn.lili.modules.member.mapper.MemberMapper;
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
@@ -859,6 +860,26 @@
}
@Override
+ public void updateTraces(UpdateTracesDTO updateTracesDTO) {
+ LambdaQueryWrapper<OrderPackage> eq = Wrappers.<OrderPackage>lambdaQuery()
+ .eq(OrderPackage::getOrderSn, updateTracesDTO.getOrderSn())
+ .eq(OrderPackage::getPackageNo, updateTracesDTO.getPackageNo());
+ OrderPackage one = orderPackageService.getOne(eq);
+ if (one == null) {
+ throw new ServiceException("褰撳墠鍖呰９涓嶅瓨鍦�");
+ }
+
+ String logisticsId = updateTracesDTO.getLogisticsId();
+ if (StringUtils.isNotBlank(logisticsId)) {
+ Logistics logic = logisticsService.getById(logisticsId);
+ one.setLogisticsNo(updateTracesDTO.getLogisticsNo());
+ one.setLogisticsCode(logic.getCode());
+ one.setLogisticsName(logic.getName());
+ orderPackageService.updateById(one);
+ }
+ }
+
+ @Override
public Traces getMapTraces(String orderSn) {
//鑾峰彇璁㈠崟淇℃伅
Order order = this.getBySn(orderSn);
@@ -1154,7 +1175,31 @@
checkBatchDeliver(orderBatchDeliverDTOList);
//璁㈠崟鎵归噺鍙戣揣
for (OrderBatchDeliverDTO orderBatchDeliverDTO : orderBatchDeliverDTOList) {
- this.delivery(orderBatchDeliverDTO.getOrderSn(), orderBatchDeliverDTO.getLogisticsNo(), orderBatchDeliverDTO.getLogisticsId());
+ String logisticsNo = orderBatchDeliverDTO.getLogisticsNo();
+ String[] split = logisticsNo.split(",");
+ //濡傛灉鐗╂祦鍗曞彿鍖呭惈澶氫釜锛屽垯杩涜鎷嗗崟
+ if (split.length > 1) {
+ for (int i = 0; i < split.length; i++) {
+ PartDeliveryParamsDTO partDeliveryParamsDTO = new PartDeliveryParamsDTO();
+ partDeliveryParamsDTO.setOrderSn(orderBatchDeliverDTO.getOrderSn());
+ partDeliveryParamsDTO.setLogisticsNo(split[i]);
+ partDeliveryParamsDTO.setLogisticsId(orderBatchDeliverDTO.getLogisticsId());
+ ArrayList<PartDeliveryDTO> partDeliveryDTOList = new ArrayList<>();
+ partDeliveryParamsDTO.setPartDeliveryDTOList(partDeliveryDTOList);
+ if (i == split.length - 1){
+ List<OrderItem> orderItemList = orderItemService.getByOrderSn(orderBatchDeliverDTO.getOrderSn());
+ for (OrderItem orderItem : orderItemList) {
+ if (RefundStatusEnum.NO_REFUND.name().equals(orderItem.getIsRefund())) {
+ PartDeliveryDTO partDeliveryDTO = new PartDeliveryDTO();
+ partDeliveryDTO.setDeliveryNum(orderItem.getNum());
+ partDeliveryDTO.setOrderItemId(orderItem.getId());
+ partDeliveryDTOList.add(partDeliveryDTO);
+ }
+ }
+ }
+ this.partDelivery(partDeliveryParamsDTO);
+ }
+ }
}
}
@@ -1800,7 +1845,10 @@
// 鎻愬彇鍟嗗搧鍚嶏紙娉ㄦ剰锛氶敭鏄痳esultMap涓畾涔夌殑property鍊�"goodsName"锛�
if (Objects.nonNull(map.get("goodsName"))) {
String goodsName = map.get("goodsName").toString();
- goodsData.add(goodsName);
+ String buyerCount = map.get("buyerCount").toString();
+ String repurchaseBuyerCount = map.get("repurchaseBuyerCount").toString();
+ String format = String.format("%s:璐拱浜烘暟 %s 澶嶈喘浜烘暟%s", goodsName, buyerCount, repurchaseBuyerCount);
+ goodsData.add(format);
}
// 鎻愬彇澶嶈喘鐜囷紙澶嶈喘鐜囬�氬父鏄暟瀛楃被鍨嬶紝杩欓噷鐢˙igDecimal鎺ユ敹锛�
diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
index d4e174b..b860033 100644
--- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
@@ -100,7 +100,7 @@
if (Objects.nonNull(searchDTO.getCanFilter()) && searchDTO.getCanFilter()) {
// 浣跨敤sn瀛楁鎺掑簭骞跺湪鎶樺彔鏃堕�夋嫨sn鏈�灏忕殑璁板綍
searchQueryBuilder.withCollapseField("goodsId.keyword");
- searchQueryBuilder.withSort(SortBuilders.fieldSort("sn.keyword").order(SortOrder.ASC));
+ searchQueryBuilder.withSort(SortBuilders.fieldSort("price").order(SortOrder.ASC));
}
NativeSearchQuery searchQuery = searchQueryBuilder.build();
searchQuery.setTrackTotalHits(true);
diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewMapper.java
index 6eeea40..f4aac4e 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewMapper.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewMapper.java
@@ -22,4 +22,12 @@
*/
@Select("SELECT sum(uv_num) FROM li_s_platform_view_data ${ew.customSqlSegment}")
Integer count(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+ /**
+ * UV娴侀噺缁熻
+ *
+ * @param queryWrapper 鏌ヨ鏉′欢
+ * @return UV娴侀噺缁熻鏁伴噺
+ */
+ @Select("SELECT COUNT(DISTINCT(user_id)) FROM lmk_action_record ${ew.customSqlSegment}")
+ Integer uvCount(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
}
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java
index 48b678f..542da4a 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java
@@ -220,6 +220,32 @@
return result;
}
+// @Override
+// public Integer countUv(StatisticsQueryParam queryParam) {
+// Date[] dates = StatisticsDateUtil.getDateArray(queryParam);
+// //鑾峰彇褰撳墠鏃堕棿
+// Calendar calendar = Calendar.getInstance();
+//
+// calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+// calendar.set(Calendar.MILLISECOND, 0);
+// //濡傛灉鏄粖澶╃殑缁熻锛屽垯浠巖edis 涓嬁锛屽惁鍒欎粠鏁版嵁搴撲腑鎷�
+// if (dates[0].equals(calendar.getTime())) {
+// if (StringUtils.isNotEmpty(queryParam.getStoreId())) {
+// return cache.counter(CachePrefix.UV.getPrefix() + StatisticsSuffix.suffix(queryParam.getStoreId())).intValue();
+// }
+// return cache.counter(CachePrefix.UV.getPrefix() + StatisticsSuffix.suffix()).intValue();
+// } else {
+// QueryWrapper queryWrapper = new QueryWrapper();
+// queryWrapper.between("date", dates[0], dates[1]);
+// //鏍规嵁搴楅摵鏌ヨ鍒ゅ畾锛屽鏋滄湁锛屽垯搴楅摵鏌ヨ锛屽鏋滄病鏈夛紝鍒欐牴鎹晢瀹舵煡璇�
+// if (StringUtils.isNotEmpty(queryParam.getStoreId())) {
+// queryWrapper.eq("store_id", queryParam.getStoreId());
+// } else {
+// queryWrapper.eq("store_id", -1);
+// }
+// return this.baseMapper.count(queryWrapper);
+// }
+// }
@Override
public Integer countUv(StatisticsQueryParam queryParam) {
Date[] dates = StatisticsDateUtil.getDateArray(queryParam);
@@ -228,23 +254,11 @@
calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
calendar.set(Calendar.MILLISECOND, 0);
- //濡傛灉鏄粖澶╃殑缁熻锛屽垯浠巖edis 涓嬁锛屽惁鍒欎粠鏁版嵁搴撲腑鎷�
- if (dates[0].equals(calendar.getTime())) {
- if (StringUtils.isNotEmpty(queryParam.getStoreId())) {
- return cache.counter(CachePrefix.UV.getPrefix() + StatisticsSuffix.suffix(queryParam.getStoreId())).intValue();
- }
- return cache.counter(CachePrefix.UV.getPrefix() + StatisticsSuffix.suffix()).intValue();
- } else {
+
QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.between("date", dates[0], dates[1]);
- //鏍规嵁搴楅摵鏌ヨ鍒ゅ畾锛屽鏋滄湁锛屽垯搴楅摵鏌ヨ锛屽鏋滄病鏈夛紝鍒欐牴鎹晢瀹舵煡璇�
- if (StringUtils.isNotEmpty(queryParam.getStoreId())) {
- queryWrapper.eq("store_id", queryParam.getStoreId());
- } else {
- queryWrapper.eq("store_id", -1);
- }
- return this.baseMapper.count(queryWrapper);
- }
+ queryWrapper.between("start_time", dates[0], dates[1]);
+ queryWrapper.eq("page_status", "JOIN");
+ return this.baseMapper.uvCount(queryWrapper);
}
/**
diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java
index 7038a6b..f6cc378 100644
--- a/framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java
@@ -75,11 +75,11 @@
//鍒涘缓鏃堕棿
if (CharSequenceUtil.isNotEmpty(startDate) && CharSequenceUtil.isNotEmpty(endDate)) {
- wrapper.between("bill_time", startDate, endDate);
+ wrapper.between("create_time", startDate, endDate);
} else if (CharSequenceUtil.isNotEmpty(startDate)) {
- wrapper.ge("bill_time", startDate);
+ wrapper.ge("create_time", startDate);
} else if (CharSequenceUtil.isNotEmpty(endDate)) {
- wrapper.le("bill_time", endDate);
+ wrapper.le("create_time", endDate);
}
//璐﹀崟鍙�
wrapper.eq(CharSequenceUtil.isNotEmpty(sn), "sn", sn);
diff --git a/framework/src/main/resources/mapper/lmk/GoodsCustomizeTemplateMapper.xml b/framework/src/main/resources/mapper/lmk/GoodsCustomizeTemplateMapper.xml
index 470805f..997740d 100644
--- a/framework/src/main/resources/mapper/lmk/GoodsCustomizeTemplateMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/GoodsCustomizeTemplateMapper.xml
@@ -36,6 +36,7 @@
<if test="query.status != null and query.status !=''">
AND LGCT.status = #{query.status}
</if>
+ order by LGCT.create_time DESC
</select>
<resultMap id="getCustomizeTemplateMap" type="cn.lili.modules.lmk.domain.vo.CustomizeTemplateVO">
<id property="id" column="id"/>
diff --git a/framework/src/main/resources/mapper/lmk/VideoMapper.xml b/framework/src/main/resources/mapper/lmk/VideoMapper.xml
index 6014df8..f4ede83 100644
--- a/framework/src/main/resources/mapper/lmk/VideoMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/VideoMapper.xml
@@ -814,38 +814,117 @@
<select id="getAuthorLikeVideoPage" resultMap="WxResultMap">
SELECT
- LV.author_id,
- LV.cover_url,
- LV.video_fit,
- LV.video_duration,
- LV.video_file_key,
- LV.title,
- LV.goods_view_num,
- LV.goods_order_num,
- LV.recommend,
- LV.status,
- LV.play_num,
- LV.comment_num,
- LV.collect_num,
- LV.thumbs_up_num,
- LV.weight,
- LV.audit_pass_time,
- LV.update_time,
- LV.video_content_type,
- LV.video_type,
- LV.video_imgs,
- LV.id,
- LM.nick_name as authorName,
- LM.face as authorAvatar
+ *
FROM
- lmk_thumbs_up_record LMC
- INNER JOIN lmk_video LV ON LMC.ref_id = LV.id AND LV.delete_flag = 0 AND LV.status = '1'
- LEFT JOIN li_member LM ON LV.author_id = LM.id
- WHERE
- LMC.delete_flag = 0 AND LMC.user_id = #{query.authorId} AND LMC.thumbs_up_type = 'video' AND LV.video_type = #{query.videoType}
+ (
+ SELECT
+ LV.author_id,
+ LV.cover_url,
+ LV.video_fit,
+ LV.video_duration,
+ LV.video_file_key,
+ LV.title,
+ LV.goods_view_num,
+ LV.goods_order_num,
+ LV.recommend,
+ LV.STATUS,
+ LV.play_num,
+ LV.comment_num,
+ LV.collect_num,
+ LV.thumbs_up_num,
+ LV.weight,
+ LV.audit_pass_time,
+ LV.update_time,
+ LV.video_content_type,
+ LV.video_type,
+ LV.video_imgs,
+ LV.id,
+ LM.nick_name AS authorName,
+ LM.face AS authorAvatar,
+ LV.create_time
+ FROM
+ lmk_thumbs_up_record LMC
+ INNER JOIN lmk_video LV ON LMC.ref_id = LV.id
+ AND LV.delete_flag = 0
+ AND LV.STATUS = '1'
+ LEFT JOIN li_member LM ON LV.author_id = LM.id
+ WHERE
+ LMC.delete_flag = 0
+ AND LM.id IS NOT NULL
+ AND LMC.user_id = #{query.authorId} AND LMC.thumbs_up_type = 'video' AND LV.video_type = #{query.videoType}
+ UNION ALL
+ SELECT
+ LV.author_id,
+ LV.cover_url,
+ LV.video_fit,
+ LV.video_duration,
+ LV.video_file_key,
+ LV.title,
+ LV.goods_view_num,
+ LV.goods_order_num,
+ LV.recommend,
+ LV.STATUS,
+ LV.play_num,
+ LV.comment_num,
+ LV.collect_num,
+ LV.thumbs_up_num,
+ LV.weight,
+ LV.audit_pass_time,
+ LV.update_time,
+ LV.video_content_type,
+ LV.video_type,
+ LV.video_imgs,
+ LV.id,
+ LM.nick_name AS authorName,
+ LM.avatar AS authorAvatar,
+ LV.create_time
+ FROM
+ lmk_thumbs_up_record LMC
+ INNER JOIN lmk_video LV ON LMC.ref_id = LV.id
+ AND LV.delete_flag = 0
+ AND LV.STATUS = '1'
+ LEFT JOIN li_admin_user LM ON LV.author_id = LM.id
+ WHERE
+ LMC.delete_flag = 0
+ AND LM.id IS NOT NULL
+ AND LMC.user_id = #{query.authorId} AND LMC.thumbs_up_type = 'video' AND LV.video_type = #{query.videoType}) t
ORDER BY
- LMC.create_time DESC
+ t.create_time DESC
</select>
+<!-- <select id="getAuthorLikeVideoPage" resultMap="WxResultMap">-->
+<!-- SELECT-->
+<!-- LV.author_id,-->
+<!-- LV.cover_url,-->
+<!-- LV.video_fit,-->
+<!-- LV.video_duration,-->
+<!-- LV.video_file_key,-->
+<!-- LV.title,-->
+<!-- LV.goods_view_num,-->
+<!-- LV.goods_order_num,-->
+<!-- LV.recommend,-->
+<!-- LV.status,-->
+<!-- LV.play_num,-->
+<!-- LV.comment_num,-->
+<!-- LV.collect_num,-->
+<!-- LV.thumbs_up_num,-->
+<!-- LV.weight,-->
+<!-- LV.audit_pass_time,-->
+<!-- LV.update_time,-->
+<!-- LV.video_content_type,-->
+<!-- LV.video_type,-->
+<!-- LV.video_imgs,-->
+<!-- LV.id,-->
+<!-- LM.nick_name as authorName,-->
+<!-- LM.face as authorAvatar-->
+<!-- FROM-->
+<!-- lmk_thumbs_up_record LMC-->
+<!-- INNER JOIN lmk_video LV ON LMC.ref_id = LV.id AND LV.delete_flag = 0 AND LV.status = '1'-->
+<!-- LEFT JOIN li_member LM ON LV.author_id = LM.id-->
+<!-- WHERE-->
+<!-- LMC.delete_flag = 0 AND LMC.user_id = #{query.authorId} AND LMC.thumbs_up_type = 'video' AND LV.video_type = #{query.videoType}-->
+<!-- ORDER BY-->
+<!-- LMC.create_time DESC-->
+<!-- </select>-->
<!-- 寰俊瑙嗛缂栬緫璇︽儏 -->
diff --git a/framework/src/main/resources/mapper/lmk/orderMapper.xml b/framework/src/main/resources/mapper/lmk/orderMapper.xml
index 45ecbb7..6c87092 100644
--- a/framework/src/main/resources/mapper/lmk/orderMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/orderMapper.xml
@@ -15,6 +15,8 @@
<resultMap id="productRepurchase" type="java.util.Map">
<result column="goods_name" property="goodsName"/>
<result column="repurchase_rate_percent" property="repurchaseRate"/>
+ <result column="buyer_count" property="buyerCount"/>
+ <result column="repurchase_buyer_count" property="repurchaseBuyerCount"/>
</resultMap>
<resultMap id="viewDataCount" type="java.util.Map">
diff --git a/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
index ce4e681..5375589 100644
--- a/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
@@ -15,6 +15,7 @@
import cn.lili.modules.lmk.service.GoodsCustomizeTemplateService;
import cn.lili.modules.lmk.service.UserCheckTemplateService;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
+import cn.lili.modules.member.entity.dto.UpdateTracesDTO;
import cn.lili.modules.member.service.StoreLogisticsService;
import cn.lili.modules.order.cart.entity.vo.BindingTemplateParam;
import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
@@ -265,6 +266,12 @@
return ResultUtil.data(orderPackageService.getOrderPackageVOList(orderSn));
}
+ @PostMapping(value = "/updateTraces")
+ public ResultMessage<Object> updateTraces(@RequestBody UpdateTracesDTO updateTracesDTO) {
+ orderService.updateTraces(updateTracesDTO);
+ return ResultUtil.success(ResultCode.SUCCESS);
+ }
+
@ApiOperation(value = "鏌ヨ鐗╂祦韪抗")
@ApiImplicitParams({
@ApiImplicitParam(name = "orderSn", value = "璁㈠崟缂栧彿", required = true, dataType = "String", paramType = "path")
--
Gitblit v1.8.0