weizhiqiang1995/erp-pro
1
1
Fork 0
mirror of https://github.com/weizhiqiang1995/erp-pro.git synced 2025-03-06 12:23:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

feat: 订单评价查询结果增加创建人信息和店铺信息，queryOrderCommentPageList接口可以根据订单id或订单子单id查询

Browse source
This commit is contained in:
wst 2024-12-02 19:46:57 +08:00
parent 9c0c3de47f
commit 86eae069a7
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
skyeye-shop/shop-store/src/main/java/com/skyeye/order/entity/OrderComment.java
View file

@ -11,6 +11,8 @@ import com.skyeye.annotation.api.ApiModel;
import com.skyeye.annotation.api.ApiModelProperty;
import com.skyeye.annotation.api.Property;
import com.skyeye.common.entity.features.OperatorUserInfo;
import com.skyeye.common.enumeration.WhetherEnum;
import com.skyeye.order.enums.OrderCommentType;
import lombok.Data;
import java.util.Map;
@ -69,7 +71,7 @@ public class OrderComment extends OperatorUserInfo {
private String orderItemId;
@TableField(value = "type")
@ApiModelProperty(value = "类型,参考#OrderCommentType")
@ApiModelProperty(value = "类型",enumClass = OrderCommentType.class)
private Integer type;
@TableField(value = "start")
@ -77,7 +79,7 @@ public class OrderComment extends OperatorUserInfo {
private Integer start;
@TableField(value = "is_comment")
@ApiModelProperty(value = "是否评价,1:是,0:否,参考#WhetherEnum")
@ApiModelProperty(value = "是否评价",enumClass = WhetherEnum.class)
private Integer isComment;
@TableField(value = "context")

26
skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java
View file

@ -32,6 +32,8 @@ import com.skyeye.order.enums.ShopOrderCommentState;
import com.skyeye.order.service.OrderCommentService;
import com.skyeye.order.service.OrderItemService;
import com.skyeye.order.service.OrderService;
import com.skyeye.service.MemberService;
import com.skyeye.store.service.ShopStoreService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -63,7 +65,10 @@ public class OrderCommentServiceImpl extends SkyeyeBusinessServiceImpl<OrderComm
private OrderItemService orderItemService;
@Autowired
private IAuthUserService iAuthUserService;
private MemberService memberService;
@Autowired
private ShopStoreService shopStoreService;
@Override
public void validatorEntity(OrderComment orderComment) {
@ -90,7 +95,8 @@ public class OrderCommentServiceImpl extends SkyeyeBusinessServiceImpl<OrderComm
entity.getType() == OrderCommentType.CUSTOMERLATER.getKey()) {
entity.setIsComment(WhetherEnum.DISABLE_USING.getKey());
}
//TODO storeId
OrderItem orderItem = orderItemService.selectById(entity.getOrderItemId());
entity.setStoreId(ObjectUtil.isEmpty(orderItem) ? "" :orderItem.getStoreId());// 设置门店id
}
@Override
@ -117,14 +123,17 @@ public class OrderCommentServiceImpl extends SkyeyeBusinessServiceImpl<OrderComm
}
iMaterialService.setDataMation(orderComment, OrderComment::getMaterialId);
iMaterialNormsService.setDataMation(orderComment, OrderComment::getNormsId);
memberService.setDataMation(orderComment, OrderComment::getCreateId);
shopStoreService.setDataMation(orderComment, OrderComment::getStoreId);
return orderComment;
}
public List<Map<String, Object>> queryPageDataList(InputObject inputObject) {
List<Map<String, Object>> mapList = super.queryPageDataList(inputObject);
iMaterialService.setMationForMap(mapList, "materialId", "materialMation");
iMaterialNormsService.setMationForMap(mapList, "normsId", "no1rmsMation");
iAuthUserService.setMationForMap(mapList, "createId", "createMation");
iMaterialNormsService.setMationForMap(mapList, "normsId", "normsMation");
memberService.setMationForMap(mapList, "createId", "createMation");
shopStoreService.setMationForMap(mapList, "storeId","storeMation");
return mapList;
}
@ -148,12 +157,15 @@ public class OrderCommentServiceImpl extends SkyeyeBusinessServiceImpl<OrderComm
String typeId = commonPageInfo.getTypeId();
Page pages = PageHelper.startPage(commonPageInfo.getPage(), commonPageInfo.getLimit());
QueryWrapper<OrderComment> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(MybatisPlusUtil.toColumns(OrderComment::getCreateId), typeId)
.or().eq(MybatisPlusUtil.toColumns(OrderComment::getMaterialId), typeId);
queryWrapper.eq(MybatisPlusUtil.toColumns(OrderComment::getCreateId), typeId)// 创建人id
.or().eq(MybatisPlusUtil.toColumns(OrderComment::getMaterialId), typeId) // 商品id
.or().eq(MybatisPlusUtil.toColumns(OrderComment::getOrderItemId), typeId)// 订单子单id
.or().eq(MybatisPlusUtil.toColumns(OrderComment::getOrderId), typeId); // 订单id
List<OrderComment> list = list(queryWrapper);
iMaterialService.setDataMation(list, OrderComment::getMaterialId);
iMaterialNormsService.setDataMation(list, OrderComment::getNormsId);
iAuthUserService.setDataMation(list, OrderComment::getCreateId);
memberService.setDataMation(list, OrderComment::getCreateId);
shopStoreService.setDataMation(list, OrderComment::getStoreId);
List<Map<String, Object>> mapList = JSONUtil.toList(JSONUtil.toJsonStr(list), null);
outputObject.setBeans(mapList);
outputObject.settotal(pages.getTotal());