积分修改bug3

lidongdong

2023-11-20 ff04a0429b0bc83adf4c2b0a23e2c1c86f745b0f

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

@@ -5,6 +5,11 @@
import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO;
import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingOrderVO;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiShoppingOrderVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
@@ -354,9 +359,11 @@

    @ApiOperation(value = "项目参与人员取消报名")
    @DeleteMapping("/expurgateJoinData")
    public R expurgateJoinData(@RequestParam("id") String id)
    public R expurgateJoinData(@RequestParam(value = "id", required = false) String id,
                               @RequestParam(value = "projectId", required = false) String projectId,
                               @RequestParam(value = "userId", required = false) String userId)
    {
        return newStriveForFeign.expurgateJoinData(id);
        return newStriveForFeign.expurgateJoinData(id,projectId,userId);
    }


@@ -406,7 +413,7 @@

    /*******************************************************************************************************************
     *
     *
     *                                  微心愿app
     *
     * ****************************************************************************************************************/

@@ -545,4 +552,222 @@
        return newStriveForFeign.getResourceSharingDetails(id);
    }


    /*******************************************************************************************************
     *
     *                   积分商城
     *
     *******************************************************************************************************/
    @ApiOperation(value = "积分商品列表", response = NewFightShoppingVO.class)
    @GetMapping("/getFightShoppingList")
    public R getFightShoppingList(@RequestParam("pageNum") int pageNum,
                                  @RequestParam("pageSize") int pageSize,
                                  @RequestParam(value = "goodName", required = false)String goodName,
                                  @RequestParam(value = "goodType", required = false)String goodType,
                                  @RequestParam(value = "id", required = false)String id)
    {
        return newStriveForFeign.getFightShoppingList(pageNum,pageSize,getCommunityId()+"",
                goodName,goodType,id);
    }


    @ApiOperation(value = "积分商品详情", response = NewFightShoppingVO.class)
    @GetMapping("/getFightShoppingDetails")
    public R getFightShoppingDetails(@RequestParam("id") String id)
    {
        return newStriveForFeign.getFightShoppingDetails(id);
    }


    /*******************************************************************************************************
     *
     *                                           商家模块
     *
     * ********************************************************************************************************/

    @ApiOperation(value = "商家列表", response = NewFightConvenientMerchantVO.class)
    @GetMapping("/pageMerchant")
    public R pageMerchant(@RequestParam("pageNum") int pageNum,
                          @RequestParam("pageSize") int pageSize,
                          @RequestParam(value = "keyword", required = false)String keyword)
    {
        return newStriveForFeign.pageMerchant(pageNum,pageSize,getCommunityId()+"","0",
                keyword,"1");
    }

    /**
     * 查询商家信息
     *
     * @param merchantId
     * @return
     */
    @ApiOperation(value = "商家详情", response = NewFightConvenientMerchantVO.class)
    @GetMapping("/selectMerchantById")
    public R selectMerchantById(@RequestParam("merchantId") String merchantId)
    {
        return newStriveForFeign.selectMerchantById(merchantId);
    }



    /*****************************************************************************************************
     *
     *                                       用户积分任务完成情况
     *
     *******************************************************************************************************/
    /**
     * 列表
     * @param
     * @return
     */
    @ApiOperation(value = "用户积分任务列表", response = IntegratingTaskVO.class)
    @GetMapping("/getTaskList")
    public R getIntegratingTaskList()
    {
        return newStriveForFeign.getIntegratingTaskList(getUserId()+"",
                getCommunityId()+"");
    }

    /**
     * 新增
     * @param
     * @return
     */
    @ApiOperation(value = "用户积分任务去完成  只传 status ")
    @PostMapping("/addIntegratingTaskData")
    public R addIntegratingTaskData(@RequestBody IntegratingTaskVO item)
    {
        item.setIsDraw("1");
        item.setUserId(getUserId()+"");
        item.setCommunityId(getCommunityId()+"");
        return newStriveForFeign.addIntegratingTaskData(item);
    }


    /**
     * 添加或者修改积分
     * @param item
     * @return
     */
    @ApiOperation(value = "用户领取积分")
    @PostMapping("/IntegratingTask/upIntegral")
    public R upIntegral(@RequestBody NewFightIntegral item)
    {
        return newStriveForFeign.upIntegral(item);
    }


    /*******************************************************************************************************************
     *
     *                                        商品订单
     *
     ****************************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @ApiOperation(value = "订单列表", response = NewFightShoppingOrderVO.class)
    @GetMapping("/orderGetList")
    public R orderGetList(@RequestParam("pageNum") int pageNum,
                          @RequestParam("pageSize") int pageSize,
                          @RequestParam(value = "userId", required = false)String userId,
                          @RequestParam(value = "goodsId", required = false)String goodsId,
                          @RequestParam(value = "orderNumber", required = false)String orderNumber,
                          @RequestParam(value = "goodName", required = false)String goodName,
                          @RequestParam(value = "name", required = false)String name,
                          @RequestParam(value = "cancelType", required = false)String cancelType)
    {
        return newStriveForFeign.orderGetList(pageNum,pageSize,userId,goodsId,orderNumber,
                goodName,name,cancelType,getCommunityId()+"");
    }

    /**
     * 分页详情
     * @param
     * @return
     */
    @ApiOperation(value = "订单详情", response = NewFightShoppingOrderVO.class)
    @GetMapping("/orderGetDetails")
    public R orderGetDetails(@RequestParam("id") String id)
    {
        return newStriveForFeign.orderGetDetails(id,getCommunityId()+"");
    }

    /**
     * 新增
     * @param
     * @return
     */
    @ApiOperation(value = "订单添加")
    @PostMapping("/orderAddData")
    public R orderAddData(@RequestBody NewFightShoppingOrderVO item)
    {
        item.setCommunityId(getCommunityId()+"");
        item.setUserId(getUserId()+"");
        return newStriveForFeign.orderAddData(item);
    }


    /**
     * 编辑
     * @param
     * @return
     */
    @ApiOperation(value = "订单编辑", response = NewFightShoppingOrderVO.class)
    @PostMapping("/NewFightOrder/orderEditData")
    public R orderEditData(@RequestBody NewFightShoppingOrderVO item)
    {
        return newStriveForFeign.orderEditData(item);
    }


    /**
     * 取消
     * @param
     * @return
     */
    @ApiOperation(value = "订单取消")
    @GetMapping("/orderCancelOrder")
    public R orderCancelOrder(@RequestParam("orderId") String orderId)
    {
        return newStriveForFeign.orderCancelOrder(orderId,getCommunityId()+"");
    }


    /**
     * 删除
     * @param
     * @return
     */
    @ApiOperation(value = "订单删除")
    @DeleteMapping("/orderExpurgateData")
    public R orderExpurgateData(@RequestParam("id") String id)
    {
        return newStriveForFeign.orderExpurgateData(id,getCommunityId()+"");
    }


    @ApiOperation(value = "订单核销")
    @GetMapping("/orderCheck")
    public R orderEditData(@RequestParam("id") String id)
    {

        if(org.apache.commons.lang3.StringUtils.isEmpty(id))
        {
            return R.fail("订单id不能为空");
        }

        NewFightShoppingOrderVO vo=new NewFightShoppingOrderVO();
        vo.setId(id);
        vo.setCancelType("1");
        vo.setCancelTime(new Date());
        return newStriveForFeign.orderEditData(vo);
    }






}