Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 119ccc4f2bed0f07b5807e0ff1d4e00301e674bd

Merge remote-tracking branch 'origin/master'

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java

@@ -853,14 +853,12 @@
                orderGood.setSeckillJson(JSON.toJSONString(goodsSeckill));
            }
            for (int i = 0; i < objects.size(); i++) {
                Long id = objects.getJSONObject(i).getLong("id");
                if(myShoppingCartVo.getId().equals(id)){
                    Integer num1 = objects.getJSONObject(i).getInteger("num");
                    orderGood.setNum(num1);
                    Goods goods1 = goodsClient.getGoodsById(myShoppingCartVo.getGoodsId()).getData();
                    orderGood.setGoodJson(JSON.toJSONString(goods1));
                    break;
                }
                Integer id = objects.getJSONObject(i).getInteger("id");
                Integer num1 = objects.getJSONObject(i).getInteger("num");
                orderGood.setNum(num1);
                Goods goods1 = goodsClient.getGoodsById(id).getData();
                orderGood.setGoodJson(JSON.toJSONString(goods1));
                break;
            }
            orderGood.setDelFlag(0);
            orderGood.setCreateTime(LocalDateTime.now());

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java

@@ -107,7 +107,7 @@
     */
    @GetMapping("/technicianListByShopId")
    @ApiOperation(value = "技师列表", tags = {"技师列表-小程序"})
    public R<TableDataInfo> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId) {
    public R<TableDataInfo<TechnicianVO>> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId) {
        startPage();
        return R.ok(getDataTable(technicianService.getTechnicianListByShopId(shopId)));
    }