用户管理

jiangqs

2023-05-30 fc39a04331e80226d50242ac1ec27f93494fb359

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java

@@ -32,6 +32,7 @@
import com.ruoyi.order.mapper.order.OrderMapper;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -696,6 +697,8 @@
        BigDecimal goodsPrice;
        BigDecimal goodsTotalPrice;
        BigDecimal goodsRealPrice;
        Long shopId = merNewOrderDto.getShopId();
        Shop shop = remoteShopService.getShop(shopId).getData();
        List<AppMemberCouponVo> appMemberCouponVoList = remoteMemberService.listVoMemberCouponByUserId(userId).getData();
        Map<Long,AppMemberCouponVo> appMemberCouponVoMap = new HashMap<>();
        if(null != appMemberCouponVoList){
@@ -726,7 +729,7 @@
            //商户定制价格
            AppShopGoodsGetDto appShopGoodsGetDto = new AppShopGoodsGetDto();
            appShopGoodsGetDto.setGoodsId(goods.getGoodsId());
            appShopGoodsGetDto.setShopId(merNewOrderDto.getShopId());
            appShopGoodsGetDto.setShopId(shopId);
            ShopGoods shopGoods = remoteGoodsService.getShopGoods(appShopGoodsGetDto).getData();
            if(shopGoods!=null){
                goodsPrice = shopGoods.getSalesPrice();
@@ -792,7 +795,7 @@
        order.setOrderStatus(3);
        order.setOrderNo(orderNo);
        order.setOrderFrom(3);
        order.setShopId(merNewOrderDto.getShopId());
        order.setShopId(shopId);
        order.setUserId(userId);
        order.setOrderMoney(orderGoodsMoney);
        order.setCouponMoney(couponDiscount);
@@ -847,7 +850,8 @@
        if(member!=null&&member.getBindingFlag()!=1){
            //绑定商户
            AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
            appMemberBindingDto.setShopId(merNewOrderDto.getShopId());
            appMemberBindingDto.setShopId(shopId);
            appMemberBindingDto.setShopName(shop.getShopName());
            appMemberBindingDto.setUserId(userId);
            appMemberBindingDto.setBindingFlag(1);
            remoteMemberService.updateMemberBinding(appMemberBindingDto);
@@ -924,4 +928,26 @@
        }
        return merMemberNoClearOrderVoList;
    }

    /**
     * 获取用户订单统计
     * @param mgtMemberOrderTotalDto
     * @return
     */
    @Override
    public MgtMemberOrderTotalVo getMgtMemberOrderTotal(MgtMemberOrderTotalDto mgtMemberOrderTotalDto){
        MgtMemberOrderTotalVo mgtMemberOrderTotalVo = orderMapper.getMgtMemberOrderTotal(mgtMemberOrderTotalDto);
        return mgtMemberOrderTotalVo;
    }

    /**
     * 分页获取用户订单列表
     * @param page
     * @param mgtMemberOrderPageDto
     * @return
     */
    @Override
    public List<MgtMemberOrderPageVo> pageMgtMemberOrder(Page page, MgtMemberOrderPageDto mgtMemberOrderPageDto){
        return orderMapper.pageMgtMemberOrder(page, mgtMemberOrderPageDto);
    }
}