#feat .

yanghui

2022-11-28 42521c9b51c1bd9a40036f18fd610cd46601222d

#feat .

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java

@@ -414,7 +414,10 @@
    @PostMapping("pageRefundOrder")
    @ApiOperation(value = "退款订单分页查询 用户", response = ComShopFlowerRefundOrderVO.class)
    public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO) {
        if (null == pageComOrderRefundDTO.getStoreId()){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (loginUserInfo.getBackstageType() == 5){
            pageComOrderRefundDTO.setStoreId(loginUserInfo.getStoreIdId());
        }else {
            pageComOrderRefundDTO.setUserId(this.getUserId());
        }
        return communityService.pageRefundOrder(pageComOrderRefundDTO);

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -267,4 +267,7 @@

    @ApiModelProperty("默认地址")
    private ComShopUserAddressVO comShopUserAddressVO;

    @ApiModelProperty("商家id")
    private Long storeIdId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerRefundOrderVO.java

@@ -148,4 +148,10 @@
     */
    @ApiModelProperty("商品名称")
    private String goodsName;

    /**
     * 商品规格名称
     */
    @ApiModelProperty("商品规格名称")
    private String goodsAttrName;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java

@@ -105,6 +105,7 @@
                    orderGoodsVOS.add(orderGoodsVO);
                    sbr.append(orderGoods.getGoodsName()).append(" ");
                });
                comShopFlowerRefundOrderVO.setGoodsAttrName(orderGoodsDOList.get(0).getGoodsAttrName());
            }
            comShopFlowerRefundOrderVO.setOrderGoodsVOList(orderGoodsVOS);
            comShopFlowerRefundOrderVO.setGoodsName(sbr.toString());
@@ -261,6 +262,7 @@
                if (goodsAttrDO != null) {
                    orderGoodsVO.setGoodsAttr(goodsAttrDO.getGoodsAttrName());
                }
                comShopFlowerRefundOrderVO.setGoodsAttrName(orderGoodsDOList.get(0).getGoodsAttrName());
                orderGoodsVOS.add(orderGoodsVO);
                sbr.append(orderGoods.getGoodsName()).append(" ");
            });

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -455,4 +455,6 @@
    int checkPoint(String phone);

    ComShopUserAddressVO selectDefaultAddressVO(@Param("userId") String userId);

    Long selectStoreIdIdByUserId(@Param("userId")  Long userId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -548,6 +548,9 @@
        if (nonNull(sysUser)){
            loginUserInfoVO.setBackstageUserId(sysUser.getUserId());
            loginUserInfoVO.setBackstageType(5);
            Long storeId = userDao.selectStoreIdIdByUserId(sysUser.getUserId());
            loginUserInfoVO.setStoreIdId(storeId);

        }
        //是否为物业公司账号
        if (nonNull(sysUserDO.getPhone())){

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserDOMapper.xml

@@ -114,5 +114,8 @@
    <select id="selectDefaultAddressVO" resultType="com.panzhihua.common.model.vos.shop.ComShopUserAddressVO">
        select * from com_shop_flower_user_address where user_id = #{userId} and is_default = 1 and delete_status = 2
    </select>
    <select id="selectStoreIdIdByUserId" resultType="java.lang.Long">
        select id from com_convenient_merchants where user_id  = #{userId} and is_del = 0
    </select>

</mapper>