cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -9,6 +9,7 @@ import com.dsh.account.service.UserIntegralChangesService; import com.dsh.account.util.ResultUtil; import com.dsh.account.util.TokenUtil; import com.dsh.account.util.ToolUtil; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -105,15 +106,22 @@ @ApiOperation(value = "上传用户头像", tags = {"APP-使用福利"}) @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), @ApiImplicitParam(name = "file",value = "图片字节",dataType = "MultipartFile") @ApiImplicitParam(name = "userImage",value = "用户头像连接",dataType = "string") }) public ResultUtil uploadAppUserProfile(MultipartFile file, HttpServletRequest request){ public ResultUtil uploadAppUserProfile(String userImage){ try { Integer appUserId = tokenUtil.getUserIdFormRedis(); if(null == appUserId){ return ResultUtil.tokenErr(); } return ResultUtil.success(tauService.uploadAppUserHeadImg(appUserId,file,request)); TAppUser byId = tauService.getById(appUserId); if (ToolUtil.isNotEmpty(userImage)){ byId.setHeadImg(userImage); tauService.updateById(byId); }else { ResultUtil.error("头像不能为空！"); } return ResultUtil.success(); }catch (Exception e){ return ResultUtil.runErr(); } cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
@@ -123,7 +123,6 @@ List<Goods> queryAppUserIntegral(MallRequest request); ResultUtil uploadAppUserHeadImg(Integer appUserId, MultipartFile file, HttpServletRequest request); ProductDetailsVo productDetails(Integer goodId, Integer goodsType );
@@ -804,20 +804,6 @@ } @Override public ResultUtil uploadAppUserHeadImg(Integer appUserId, MultipartFile file, HttpServletRequest request) { try { String filePath = OssUploadUtil.ossUpload(request,file); TAppUser tAppUser = this.baseMapper.selectById(appUserId); tAppUser.setHeadImg(filePath); this.baseMapper.updateById(tAppUser); } catch (IOException e) { ResultUtil.error("头像上传失败！"); } return ResultUtil.success(); } @Override public ProductDetailsVo productDetails(Integer goodId, Integer goodsType ) { ProductDetailRequest detailsVo = new ProductDetailRequest(); detailsVo.setGoodsType(goodsType); cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -18,6 +18,7 @@ import com.dsh.activity.feignclient.other.model.Store; import com.dsh.activity.model.CouponListVo; import com.dsh.activity.model.request.CommodityRequest; import com.dsh.activity.model.request.CouponDataVo; import com.dsh.activity.model.request.CouponPackageReq; import com.dsh.activity.model.response.CouponPackageResp; import com.dsh.activity.service.CouponCityService; @@ -35,6 +36,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -366,4 +368,48 @@ } } @ResponseBody @PostMapping("/base/coupon/insertIntoCouponData") public boolean saveCouponData(@RequestBody CouponDataVo dataVo){ try { System.out.println(dataVo); Coupon coupon = new Coupon(); coupon.setName(dataVo.getCouponName()); coupon.setType(dataVo.getPrescription()); // coupon.setContent(dataVo.getIllustrate()); coupon.setIllustrate(dataVo.getIllustrate()); coupon.setDistributionMethod(dataVo.getDistributionMethod()); coupon.setRedemptionMethod(dataVo.getExchangeMethod()); coupon.setCash(dataVo.getRequiredCash()); coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints())); coupon.setQuantityIssued(dataVo.getQuantityIssued()); coupon.setPickUpQuantity(dataVo.getPickUpQuantity()); coupon.setUseScope(dataVo.getCompany()); coupon.setAuditStatus(1); coupon.setStatus(1); coupon.setInsertTime(new Date()); coupon.setCover(dataVo.getGoodImg()); List<String> goodImgs = dataVo.getGoodImgs(); StringBuilder builder = new StringBuilder(); if (goodImgs.size() > 0){ if (goodImgs.size() == 1){ coupon.setProductImages(goodImgs.get(0)); }else { for (String goodImg : goodImgs) { builder.append(goodImg).append(","); } builder.deleteCharAt(builder.lastIndexOf(",")); coupon.setProductImages(builder.toString()); } } coupon.setPublisherType(dataVo.getUserType()); if (dataVo.getUserType() == 1){ coupon.setCityManagerId(dataVo.getCityManagerId()); } return couponService.save(coupon); }catch (Exception e){ return false; } } } cloud-server-activity/src/main/java/com/dsh/activity/model/request/CouponDataVo.java
New file @@ -0,0 +1,99 @@ package com.dsh.activity.model.request; import lombok.Data; import java.math.BigDecimal; import java.util.List; @Data public class CouponDataVo { /** * 用户类型1=城市管理者 2=平台管理者 */ Integer userType; /** * 城市管理者id */ Integer cityManagerId; /** * 券名称 */ String couponName; /** * 优惠券类型 */ Integer prescription; /** * 条件金额 */ BigDecimal condition; /** * 减去金额 */ BigDecimal subtraction; /** * 折扣金额 */ BigDecimal discount; /** * 体验券名称 */ BigDecimal experience; /** * 说明 */ String illustrate; /** * 发放方式 */ Integer distributionMethod; /** * 所需积分 */ Integer requiredPoints; /** * 用户人群 */ Integer userGroup; /** * 发放数量 */ Integer quantityIssued; /** * 限领数量 */ Integer pickUpQuantity; /** * 有效期 */ String periodOfValidity; /** * 兑换方式 */ Integer exchangeMethod; /** * 所需现金 */ BigDecimal requiredCash; /** * 封面图 */ String goodImg; /** * 图片列表 */ List<String> goodImgs; /** * 适用范围 */ Integer company; /** * 城市code */ List<Integer> cityIds; /** * 门店列表 */ List<Integer> storeIds; } cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CouponClient.java
@@ -4,6 +4,7 @@ import com.dsh.course.feignClient.activity.model.Coupon; import com.dsh.course.feignClient.activity.model.CouponExamineListSearch; import com.dsh.course.feignClient.activity.model.CouponListOfSearch; import com.dsh.guns.modular.system.model.CouponDataVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -32,4 +33,8 @@ @PostMapping("/base/coupon/updateCouponExamine") boolean updateCouponData(@RequestBody Coupon coupon); @PostMapping("/base/coupon/insertIntoCouponData") void insertIntoData(CouponDataVo dataVo); } cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -10,6 +10,7 @@ import com.dsh.guns.config.UserExt; import com.dsh.guns.core.common.constant.factory.PageFactory; import com.dsh.guns.core.util.ToolUtil; import com.dsh.guns.modular.system.model.CouponDataVo; import com.dsh.guns.modular.system.model.Region; import com.dsh.guns.modular.system.service.IRegionService; import com.dsh.guns.modular.system.service.IStoreService; @@ -180,9 +181,12 @@ * 提交添加 */ @RequestMapping(value = "/commitData") public void commitData(){ public Object commitData(CouponDataVo dataVo){ Integer objectType = UserExt.getUser().getObjectType(); client.insertIntoData(dataVo); return "SUCCESS"; } } cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CouponDataVo.java
New file @@ -0,0 +1,99 @@ package com.dsh.guns.modular.system.model; import lombok.Data; import java.math.BigDecimal; import java.util.List; @Data public class CouponDataVo { /** * 用户类型1=城市管理者 2=平台管理者 */ Integer userType; /** * 城市管理者id */ Integer cityManagerId; /** * 券名称 */ String couponName; /** * 优惠券类型 */ Integer prescription; /** * 条件金额 */ BigDecimal condition; /** * 减去金额 */ BigDecimal subtraction; /** * 折扣金额 */ BigDecimal discount; /** * 体验券名称 */ BigDecimal experience; /** * 说明 */ String illustrate; /** * 发放方式 */ Integer distributionMethod; /** * 所需积分 */ Integer requiredPoints; /** * 用户人群 */ Integer userGroup; /** * 发放数量 */ Integer quantityIssued; /** * 限领数量 */ Integer pickUpQuantity; /** * 有效期 */ String periodOfValidity; /** * 兑换方式 */ Integer exchangeMethod; /** * 所需现金 */ BigDecimal requiredCash; /** * 封面图 */ String goodImg; /** * 图片列表 */ List<String> goodImgs; /** * 适用范围 */ Integer company; /** * 城市code */ List<Integer> cityIds; /** * 门店列表 */ List<Integer> storeIds; } cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponAdd.html
@@ -105,13 +105,13 @@ <div class="form-group"> <div class="initialLevel col-sm-12 control-label form-group"> <label class="col-sm-3 control-label">*发放方式: </label> <input class="col-sm-1 control-label" id="distributionMethod" type="radio" <input class="col-sm-1 control-label" name="distributionMethod" type="radio" value="1" checked style="margin-top: 10px"/> <label class="col-sm-1" style="margin-left: -15px;width: 16%;margin-top: 7px">积分购买</label> <input class="col-sm-1 control-label" id="distributionMethod" type="radio" <input class="col-sm-1 control-label" name="distributionMethod" type="radio" value="2" style="margin-left: 5%;margin-top: 10px;width: 13px;height: 13px"/> <label class="col-sm-1" style="width: 16%;margin-top: 7px">注册赠送</label> <input class="col-sm-1 control-label" id="distributionMethod" type="radio" <input class="col-sm-1 control-label" name="distributionMethod" type="radio" value="3" style="margin-left: 4%;margin-top: 10px;width: 13px;height: 13px"/> <label class="col-sm-1" style="width: 16%;margin-top: 7px">自动发券</label> </div>
