合并代码

puzhibing

2024-12-06 c963605163f4fbf91565fa5e319a17fe2545fdb4

合并代码

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/UserAddressClientFallbackFactory.java

@@ -20,7 +20,7 @@
            }
            
            @Override
            public R<UserAddress> getUserAddressById(Integer id) {
            public R<UserAddress> getUserAddressById(Long id) {
                return R.fail("根据id获取用户地址信息失败：" + cause.getMessage());
            }
        };

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/UserAddressClient.java

@@ -30,5 +30,5 @@
     * @return
     */
    @PostMapping("/user-address/getUserAddressById")
    R<UserAddress> getUserAddressById(@RequestParam("id") Integer id);
    R<UserAddress> getUserAddressById(@RequestParam("id") Long id);
}

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserAddress.java

@@ -30,6 +30,10 @@

    @TableId("id")
    private Long id;

    @TableField(exist = false)
    private String idStr;

    @TableField(exist = false)
    private String uid;


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserAddressController.java

@@ -85,6 +85,7 @@
        Long userId = tokenService.getLoginUserApplet().getUserid();
        List<UserAddress> list = userAddressService.lambdaQuery().eq(UserAddress::getAppUserId, userId).orderByDesc(UserAddress::getIsDefault).list();
        for (UserAddress userAddress : list) {
            userAddress.setIdStr(userAddress.getId().toString());
            userAddress.setUid(userAddress.getId().toString());
        }
        return R.ok(list);
@@ -140,6 +141,9 @@
    public R<List<UserAddress>> getUserAddressList(){
        Long userId = tokenService.getLoginUserApplet().getUserid();
        List<UserAddress> list = userAddressService.lambdaQuery().eq(UserAddress::getAppUserId, userId).list();
        for (UserAddress userAddress : list) {
            userAddress.setIdStr(userAddress.getId().toString());
        }
        return R.ok(list);
    }
    
@@ -150,7 +154,7 @@
     */
    @ResponseBody
    @PostMapping("/getUserAddressById")
    public R<UserAddress> getUserAddressById(@RequestParam("id") Integer id){
    public R<UserAddress> getUserAddressById(@RequestParam("id") Long id){
        UserAddress userAddress = userAddressService.getById(id);
        return R.ok(userAddress);
    }

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

@@ -530,7 +530,7 @@
            goodsShop.setGoodsId(shoppingCart.getGoodsId());
            goodsShop.setShopId(shopId);
            GoodsShop goodsShop1 = goodsShopClient.getGoodsShop(goodsShop).getData();
            vo.setVerifiable(null == goodsShop1 ? false : true);
            vo.setVerifiable(goods.getAppointStore() == 1 && null == goodsShop1 ? false : true);
            //判断当前数量是否已经超出限购数量（需要计算已经购买的数量）
            if(null == goods.getPurchaseLimit() || -1 == goods.getPurchaseLimit()){
                vo.setPurchaseLimit(false);
@@ -629,12 +629,15 @@
        if(data.size() != goodsList.size()){
            String goodsName = "";
            for (Integer goodsId : goodsIds) {
                if(!collect.contains(goodsId)){
                    goodsName = goodsClient.getGoodsById(goodsId).getData().getName();
                Goods goods = goodsClient.getGoodsById(goodsId).getData();
                if(1 == goods.getAppointStore() && !collect.contains(goodsId)){
                    goodsName = goods.getName();
                    break;
                }
            }
            return R.fail(goodsName + "不能在该门店核销");
            if(StringUtils.isNotEmpty(goodsName)){
                return R.fail(goodsName + "不能在该门店核销");
            }
        }
        //开始构建支付信息
        //现金支付的订单金额
@@ -853,12 +856,15 @@
                orderGood.setSeckillJson(JSON.toJSONString(goodsSeckill));
            }
            for (int i = 0; i < objects.size(); i++) {
                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;
                Long id = objects.getJSONObject(i).getLong("id");
                if(myShoppingCartVo.getId().equals(id.toString())){
                    ShoppingCart shoppingCart = this.getById(id);
                    Integer num1 = objects.getJSONObject(i).getInteger("num");
                    orderGood.setNum(num1);
                    Goods goods1 = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
                    orderGood.setGoodJson(JSON.toJSONString(goods1));
                    break;
                }
            }
            orderGood.setDelFlag(0);
            orderGood.setCreateTime(LocalDateTime.now());

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java

@@ -24,7 +24,7 @@
    @ApiModelProperty(value = "配送方式（1=自提，2=快递）", required = false)
    private Integer distributionMode;
    @ApiModelProperty(value = "配送地址id", required = false)
    private Integer userAddressId;
    private Long userAddressId;
    @ApiModelProperty(value = "预计提货时间", required = false)
    private String expectedDeliveryTime;
}