xiaoyong931011
2021-06-28 8a10e40cf91039e631e99c843e97a8a8f29927e4
20210628 集物员审核
1 files added
3 files modified
61 ■■■■ changed files
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java 19 ●●●● patch | view | raw | blame | history
gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java 38 ●●●●● patch | view | raw | blame | history
gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java 2 ●●● patch | view | raw | blame | history
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml 2 ●●● patch | view | raw | blame | history
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;
    }
gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java
New file
@@ -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;
}
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;
}
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