新增商品图片字段

lidongdong

2023-08-30 ff2f0deac5dcf7bb6374ad09847602e116c5d8ea

新增商品图片字段

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

@@ -78,6 +78,69 @@
     ***********************************************************************************************************/

    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/order/getList")
    public R orderMerchantGetList(@RequestParam("pageNum") int pageNum,
                                  @RequestParam("pageSize")  int pageSize,
                                  @RequestParam(value = "goodsId", required = false) String goodsId,
                                  @RequestParam(value = "orderNumber", required = false) String orderNumber,
                                  @RequestParam(value = "goodsName", required = false) String goodsName,
                                  @RequestParam(value = "condition", required = false) String condition,
                                  @RequestParam(value = "userName", required = false) String userName,
                                  @RequestParam(value = "communityId", required = false) String communityId,
                                  @RequestParam(value = "orderType", required = false) String orderType)
    {
        if(StringUtils.isEmpty(communityId))
        {
            communityId=getCommunityId()+"";
        }
        return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,communityId,getUserId()+"",orderType);
    }

    /**
     * 新增用户购买商家商品记录
     * @param
     * @return
     */
    @PostMapping("/order/insertMerchantData")
    public R insertMerchantData(@RequestBody VolunteerCreditsExchangeVO item)
    {

        if(StringUtils.isEmpty(item.getPalyIntegral()))
        {
            return R.fail("请输入兑换积分");
        }

        LoginUserInfoVO userInfoVO= getLoginUserInfo();
        if(StringUtils.isEmpty(item.getCommunityId()))
        {
            item.setCommunityId(userInfoVO.getCommunityId()+"");
        }
        item.setOrderType("2");
        item.setUserId(userInfoVO.getUserId()+"");
        item.setNeedScore(userInfoVO.getLoveIntegral());
        return communityService.insertMerchantData(item);
    }



    /**
     * 更新商家
     * @param item
     * @return
     */
    @PostMapping("/order/MerchantUpdate")
    public R orderMerchantUpdate(@RequestBody VolunteerCreditsExchangeVO item)
    {
        item.setOrderType("2");
        return communityService.update(item);
    }

    /**
     * 查询详情
     * @param id
     * @return
@@ -93,7 +156,7 @@
    }

    /**
     * 新增
     * 新增社区
     * @param
     * @return
     */
@@ -112,7 +175,7 @@
    }

    /**
     * 更新
     * 更新社区
     * @param item
     * @return
     */
@@ -139,7 +202,7 @@
    }

    /**
     * 核销
     * 核销社区
     * @param id
     * @return
     */
@@ -185,126 +248,10 @@
        return communityService.volunteerTypeGetList(pageNum,pageSize,"2");
    }

    /***********************************************************************************************************
     *
     *
     *                   商家订单兑换
     *
     *
     ***********************************************************************************************************/

    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/order/getList")
    public R orderMerchantGetList(@RequestParam("pageNum") int pageNum,
                     @RequestParam("pageSize")  int pageSize,
                     @RequestParam(value = "goodsId", required = false) String goodsId,
                     @RequestParam(value = "orderNumber", required = false) String orderNumber,
                     @RequestParam(value = "goodsName", required = false) String goodsName,
                     @RequestParam(value = "condition", required = false) String condition,
                     @RequestParam(value = "userName", required = false) String userName,
                     @RequestParam(value = "communityId", required = false) String communityId,
                     @RequestParam(value = "orderType", required = false) String orderType)
    {
        if(StringUtils.isEmpty(communityId))
        {
            communityId=getCommunityId()+"";
        }
        return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,communityId,getUserId()+"",orderType);
    }

    /**
     * 查询详情
     * @param id
     * @return
     */
    @GetMapping("/order/getData")
    public R orderMerchantGetData(@RequestParam("id") String id)
    {
        if(StringUtils.isEmpty(id))
        {
            return R.fail("订单id不能为空");
        }
        return communityService.getData(id);
    }

    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/order/insertData")
    public R orderMerchantInsertData(@RequestBody VolunteerCreditsExchangeVO item)
    {
        LoginUserInfoVO userInfoVO= getLoginUserInfo();
        if(StringUtils.isEmpty(item.getCommunityId()))
        {
            item.setCommunityId(userInfoVO.getCommunityId()+"");
        }
        item.setOrderType("2");
        item.setUserId(userInfoVO.getUserId()+"");
        item.setNeedScore(userInfoVO.getLoveIntegral());
        return communityService.insertData(item);
    }


    /**
     * 新增用户购买商家商品记录
     * @param
     * @return
     */
    @PostMapping("/order/insertMerchantData")
    public R insertMerchantData(@RequestBody VolunteerCreditsExchangeVO item)
    {

        if(StringUtils.isEmpty(item.getPalyIntegral()))
        {
            return R.fail("请输入兑换积分");
        }

        LoginUserInfoVO userInfoVO= getLoginUserInfo();
        if(StringUtils.isEmpty(item.getCommunityId()))
        {
            item.setCommunityId(userInfoVO.getCommunityId()+"");
        }
        item.setOrderType("2");
        item.setUserId(userInfoVO.getUserId()+"");
        item.setNeedScore(userInfoVO.getLoveIntegral());
        return communityService.insertMerchantData(item);
    }



    /**
     * 更新
     * @param item
     * @return
     */
    @PostMapping("/order/update")
    public R orderMerchantUpdate(@RequestBody VolunteerCreditsExchangeVO item)
    {
        item.setOrderType("2");
        return communityService.update(item);
    }

    /**
     * 删除
     * @param id
     * @return
     */
    @DeleteMapping("/order/delete")
    public R orderMerchantDelete(@RequestParam("id") String id)
    {
        if(StringUtils.isEmpty(id))
        {
            return R.fail("订单id不能为空");
        }
        return communityService.delete(id);
    }




 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerIntegralMerchantVO.java

@@ -94,4 +94,12 @@
    @ApiModelProperty(value = "商品数量")
    private String goodNum;



    /**
     * 商品数量
     */
    @ApiModelProperty(value = "商品图片")
    private String goodImgs;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerIntegralMerchant.java

@@ -94,4 +94,11 @@
    @ApiModelProperty(value = "商品数量")
    private String goodNum;


    /**
     * 商品数量
     */
    @ApiModelProperty(value = "商品图片")
    private String goodImgs;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerIntegralMerchantMapper.xml

@@ -16,6 +16,7 @@
        <result property="goodType" column="good_type" />
        <result property="merchantId" column="merchant_id" />
        <result property="goodNum" column="good_num" />
        <result property="goodImgs" column="good_imgs" />
    </resultMap>

    <sql id="sql_base">
@@ -31,6 +32,7 @@
        good_type,
        merchant_id,
        good_num,
        good_imgs,
        community_id
    </sql>

@@ -101,6 +103,9 @@
            <if test="vimVO.goodNum != null">
                good_num,
            </if>
            <if test="vimVO.goodImgs != null">
                good_imgs,
            </if>
            creation_time
        </trim>
        values
@@ -137,6 +142,9 @@
            </if>
            <if test="vimVO.goodNum != null">
                #{goodNum},
            </if>
            <if test="vimVO.goodImgs != null">
                #{goodImgs},
            </if>
            sysdate()
        </trim>
@@ -178,6 +186,9 @@
            <if test="vimVO.goodNum != null">
                good_num=#{goodNum},
            </if>
            <if test="vimVO.goodImgs != null">
                good_imgs=#{goodImgs},
            </if>
            update_time=sysdate()
        </set>
        where id = #{vimVO.id}