玩湃
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
lisy
2023-08-01 0c9f816a3fcb331c5f7555bc3080311888f0ad12 
 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java


@@ -18,10 +18,7 @@


import com.dsh.activity.util.TokenUtil;


import com.dsh.activity.util.ToolUtil;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.bind.annotation.*;




import javax.annotation.Resource;


import java.text.SimpleDateFormat;


@@ -70,12 +67,13 @@


    private CouponCityService ccityService;






    @ResponseBody


    @PostMapping("/base/pointMerchars/convertGoods")


    public List<IntegralCommodity> getConvertibleGoods(){


        List<IntegralCommodity> commodity = new ArrayList<>();


        List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>()


                .eq("state",1)


                .lt("endTime",new Date()));


                .gt("endTime",new Date()));


        if (merchandises.size() > 0){


            for (PointsMerchandise merchandise : merchandises) {


                IntegralCommodity integralCommodity = new IntegralCommodity();


@@ -83,9 +81,11 @@


                integralCommodity.setCommodityImg(merchandise.getProductImages());


                integralCommodity.setCommodityName(merchandise.getName());


                integralCommodity.setCommodityPrice(merchandise.getPrice());


                integralCommodity.setGoodsType(merchandise.getType());


                commodity.add(integralCommodity);


            }


        }


        System.out.println(commodity);


        return commodity;


    }