修改金汇社区 商品详情兑换地址

lidongdong

2023-12-08 bd03dc55328e988b3e6bd2165593b6e49c58e4c2

修改金汇社区  商品详情兑换地址

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

@@ -536,7 +536,7 @@
    @GetMapping("/shoppingGetDetails")
    public R shoppingGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.shoppingGetDetails(id);
        return jinhuiCommunityService.shoppingGetDetails(id,getCommunityId()+"");
    }



 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingVO.java

@@ -45,7 +45,23 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;

    ApiModelProperty(value = "兑换地址")
    private String address;

    @ApiModelProperty(value = "纬度")
    private String lat;

    @ApiModelProperty(value = "经度")
    private String lng;

    @ApiModelProperty(value = "兑换状态（1每天  2周一到周五   3周末）")
    private String businessType;

    @ApiModelProperty(value = "兑换开始时间")
    private String businessStartTime;

    @ApiModelProperty(value = "兑换结束时间")
    private String businessEndTime;


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java

@@ -584,7 +584,7 @@


    @GetMapping("/jinhuiShopping/shoppingGetDetails")
    public R shoppingGetDetails(@RequestParam("id") String id);
    public R shoppingGetDetails(@RequestParam("id") String id,@RequestParam("communityId") String communityId);

    /**
     * 新增

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java

@@ -580,7 +580,7 @@
    @GetMapping("/shoppingGetDetails")
    public R shoppingGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.shoppingGetDetails(id);
        return jinhuiCommunityService.shoppingGetDetails(id,getCommunityId()+"");
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiShoppingApi.java

@@ -44,9 +44,10 @@


    @GetMapping("/shoppingGetDetails")
    public R shoppingGetDetails(@RequestParam("id") String id)
    public R shoppingGetDetails(@RequestParam("id") String id,
                                @RequestParam("communityId") String communityId)
    {
        return R.ok(shoppingService.getDetails(id));
        return R.ok(shoppingService.getDetails(id,communityId));
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiShoppingDao.java

@@ -26,7 +26,7 @@
     * @param id
     * @return
     */
    JinhuiShopping getDetails(@Param("id") String id);
    JinhuiShopping getDetails(@Param("id") String id,@Param("communityId") String communityId);

    /**
     * 新增

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiShopping.java

@@ -45,7 +45,23 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;

    @ApiModelProperty(value = "兑换地址")
    private String address;

    @ApiModelProperty(value = "纬度")
    private String lat;

    @ApiModelProperty(value = "经度")
    private String lng;

    @ApiModelProperty(value = "兑换状态（1每天  2周一到周五   3周末）")
    private String businessType;

    @ApiModelProperty(value = "兑换开始时间")
    private String businessStartTime;

    @ApiModelProperty(value = "兑换结束时间")
    private String businessEndTime;


}

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiShoppingService.java

@@ -4,6 +4,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.jinhui.JinhuiShoppingVO;
import com.panzhihua.service_jinhui_community.entity.JinhuiShopping;
import org.apache.ibatis.annotations.Param;

public interface JinhuiShoppingService extends IService<JinhuiShopping>
{
@@ -15,7 +16,7 @@
    R getList(int pageNum,int pageSize,
              String goodName, String goodType, String id);

    JinhuiShopping getDetails(String id);
    JinhuiShopping getDetails(String id,String communityId);
    /**
     * 新增
     * @param

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiShoppingServiceImpl.java

@@ -12,6 +12,7 @@
import com.panzhihua.service_jinhui_community.service.JinhuiMicroVolunteeringService;
import com.panzhihua.service_jinhui_community.service.JinhuiShoppingService;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;


@@ -29,8 +30,8 @@
    }

    @Override
    public JinhuiShopping getDetails(String id) {
        return baseMapper.getDetails(id);
    public JinhuiShopping getDetails(String id,String communityId) {
        return baseMapper.getDetails(id,communityId);
    }



 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiShoppingMapper.xml

@@ -47,17 +47,24 @@

    <select id="getDetails" resultMap="itemMap">
        select
            id,
            good_name,
            good_price,
            good_type,
            cover_img_url,
            content,
            creation_time,
            update_time
        from jinhui_shopping
            js.id,
            js.good_name,
            js.good_price,
            js.good_type,
            js.cover_img_url,
            js.content,
            js.creation_time,
            js.update_time,
            vcc.address,
            vcc.lat,
            vcc.lng,
            vcc.business_type,
            vcc.business_start_time,
            vcc.business_end_time
        from jinhui_shopping as js
        left join volunteer_community_config vcc on vcc.community_id=#{communityId}
        where
            id=#{id}
            js.id=#{id}
    </select>

    <insert id="addData">