5054620d3824cf879943011d01b826b250961c36..0741dc7f25811ea2acb4127fc43d1dc9a802221c
2021-06-28 xiaoyong931011
Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
0741dc diff | tree
2021-06-28 xiaoyong931011
20210628 集物员审核
a6eec6 diff | tree
3 files modified
9 ■■■■ changed files
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java 2 ●●●●● patch | view | raw | blame | history
gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java 5 ●●●● 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
@@ -68,7 +68,9 @@
            for(JhyOrderItems jhyOrderItems : jhyOrderItemsList){
                JhyOrderItemsVo jhyOrderItemsVo = BeanUtil.copyProperties(jhyOrderItems, JhyOrderItemsVo.class);
                BigDecimal multiply = jhyOrderItemsVo.getPrice().multiply(new BigDecimal(40));
                BigDecimal multiplyScore = jhyOrderItemsVo.getPrice().multiply(jhyOrderItemsVo.getWeight()).multiply(new BigDecimal(40));
                jhyOrderItemsVo.setAllPrice(multiply);
                jhyOrderItemsVo.setAllScore(multiplyScore);
                jhyOrderItemsVolist.add(jhyOrderItemsVo);
            }
        }
gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java
@@ -18,9 +18,12 @@
    @ApiModelProperty(value="价格")
    private BigDecimal price;
    @ApiModelProperty(value="总计")
    @ApiModelProperty(value="总计= 价格*40")
    private BigDecimal allPrice;
    @ApiModelProperty(value="总积分= 价格*重量*40")
    private BigDecimal allScore;
    @ApiModelProperty(value="图片")
    private String picture;
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)*40,0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
               (select ifnull(sum(price),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
        d.username username
        FROM
        xzx_jhy_order a