From 8a10e40cf91039e631e99c843e97a8a8f29927e4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Jun 2021 21:14:30 +0800
Subject: [PATCH] 20210628 集物员审核
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 2
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 19 +++++++--
gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java | 38 +++++++++++++++++++
gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java | 2
4 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
index 86988aa..dc97abe 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
@@ -1,5 +1,6 @@
package com.xzx.gc.shop.service;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import com.github.pagehelper.PageHelper;
@@ -10,16 +11,15 @@
import com.xzx.gc.shop.dto.QueryJhyOrderListDto;
import com.xzx.gc.shop.mapper.JhyOrderItemsMapper;
import com.xzx.gc.shop.mapper.JhyOrderMapper;
-import com.xzx.gc.shop.vo.QueryGoodsListVo;
-import com.xzx.gc.shop.vo.QueryJhyOrderListVo;
-import com.xzx.gc.shop.vo.QueryScoreDetailsListVo;
-import com.xzx.gc.shop.vo.ViewJhyOrderVo;
+import com.xzx.gc.shop.vo.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import tk.mybatis.mapper.entity.Example;
import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -62,8 +62,17 @@
Example exampleItems = new Example(JhyOrderItems.class);
Example.Criteria criteriaItems = exampleItems.createCriteria();
criteriaItems.andEqualTo("orderId",id);
+ ArrayList<JhyOrderItemsVo> jhyOrderItemsVolist = new ArrayList<>();
List<JhyOrderItems> jhyOrderItemsList = jhyOrderItemsMapper.selectByExample(exampleItems);
- viewJhyOrderVo.setJhyOrderItems(jhyOrderItemsList);
+ if(CollUtil.isNotEmpty(jhyOrderItemsList)){
+ for(JhyOrderItems jhyOrderItems : jhyOrderItemsList){
+ JhyOrderItemsVo jhyOrderItemsVo = BeanUtil.copyProperties(jhyOrderItems, JhyOrderItemsVo.class);
+ BigDecimal multiply = jhyOrderItemsVo.getPrice().multiply(new BigDecimal(40));
+ jhyOrderItemsVo.setAllPrice(multiply);
+ jhyOrderItemsVolist.add(jhyOrderItemsVo);
+ }
+ }
+ viewJhyOrderVo.setJhyOrderItems(jhyOrderItemsVolist);
return viewJhyOrderVo;
}
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java
new file mode 100644
index 0000000..472181d
--- /dev/null
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java
@@ -0,0 +1,38 @@
+package com.xzx.gc.shop.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "JhyOrderItemsVo", description = "")
+public class JhyOrderItemsVo {
+
+ private Long orderId;
+
+ @ApiModelProperty(value="标题")
+ private String title;
+
+ @ApiModelProperty(value="价格")
+ private BigDecimal price;
+
+ @ApiModelProperty(value="总计")
+ private BigDecimal allPrice;
+
+ @ApiModelProperty(value="图片")
+ private String picture;
+
+ @ApiModelProperty(value="备注")
+ private String remark;
+
+ @ApiModelProperty(value="重量")
+ private BigDecimal weight;
+
+ @ApiModelProperty(value="积分")
+ private String score;
+
+ @ApiModelProperty(value="类型")
+ private Long itemType;
+}
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java
index 495c6df..360127a 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java
@@ -54,6 +54,6 @@
@ApiModelProperty(value="是否匿名 1-是2-否")
private String isAnonymous;
- private List<JhyOrderItems> JhyOrderItems;
+ private List<JhyOrderItemsVo> JhyOrderItems;
}
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index f129dc7..c502610 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -14,7 +14,7 @@
a.remark remark,
b.nick_name name,
b.mobile_phone mobilePhone,
- (select ifnull(sum(price),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
+ (select ifnull(sum(price)*40,0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
d.username username
FROM
xzx_jhy_order a
--
Gitblit v1.9.1