修改bug

puzhibing

2 天以前 7876cd5977af240d28d59d18d7a06344d36d4d32

修改bug

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java

@@ -132,7 +132,7 @@
            }
            vo.setUseGoods(sb.substring(0, sb.length() - 1));
        }
        vo.setLaveNum(coupon.getSendLimitFlag());
        vo.setLimitFlag(coupon.getSendLimitFlag());
        vo.setReceiveNum(coupon.getSendLimitNumber());
        int count = memberCouponService.count(new QueryWrapper<MemberCoupon>().eq("coupon_id", couponId).eq("del_flag", 0));
        vo.setLaveNum(coupon.getSendLimitNumber() - count);

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java

@@ -35,9 +35,6 @@
    @Resource
    private OrderService orderService;

    @Resource
    private RemoteGoodsService remoteGoodsService;


    @RequestMapping(value = "/verifyCode", method = RequestMethod.POST)
    @ApiOperation(value = "核销code")
@@ -239,16 +236,5 @@
    }


    /**
     * 抽奖的平台商品生成订单--待审核
     * @param orderVo
     * @return
     */
    @ResponseBody
    @RequestMapping(value = "/addOrder", method = RequestMethod.POST)
    public R addOrder(@RequestBody AddOrderVo orderVo){
        Goods goods = remoteGoodsService.getGoods(orderVo.getGoodsId()).getData();
        orderService.addOrder(orderVo.getShopId(), orderVo.getUserId(), goods, orderVo.getGoodsNum(), orderVo.getId(), 2);
        return R.ok();
    }

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java

@@ -10,7 +10,10 @@
import com.ruoyi.system.api.domain.dto.BoardMemberTotalDto;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.model.AddOrderVo;
import com.ruoyi.system.api.service.RemoteGoodsService;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -36,6 +39,9 @@
    
    @Resource
    private UserServiceRecordService userServiceRecordService;

    @Resource
    private RemoteGoodsService remoteGoodsService;


    @PostMapping("/getAppOrderTotal")
@@ -215,4 +221,18 @@
        List<Integer> list = userServiceRecordService.countShopServicePerson(shopId);
        return R.ok(list);
    }


    /**
     * 抽奖的平台商品生成订单--待审核
     * @param orderVo
     * @return
     */
    @ResponseBody
    @RequestMapping(value = "/addOrder", method = RequestMethod.POST)
    public R addOrder(@RequestBody AddOrderVo orderVo){
        Goods goods = remoteGoodsService.getGoods(orderVo.getGoodsId()).getData();
        orderService.addOrder(orderVo.getShopId(), orderVo.getUserId(), goods, orderVo.getGoodsNum(), orderVo.getId(), 2);
        return R.ok();
    }
}