diff --git a/admin-pc/.env.development b/admin-pc/.env.development index e1933a4..2b3f27f 100644 --- a/admin-pc/.env.development +++ b/admin-pc/.env.development @@ -1,6 +1,6 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=https://www.ddmhs.top/recycle-admin/ -# VUE_APP_API_BASE_URL=http://localhost:8002/recycle-admin/ +# VUE_APP_API_BASE_URL=https://www.ddmhs.top/recycle-admin/ +VUE_APP_API_BASE_URL=http://localhost:8002/recycle-admin/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-pc/dist.zip b/admin-pc/dist.zip index 67ecd7e..6c26d68 100644 Binary files a/admin-pc/dist.zip and b/admin-pc/dist.zip differ diff --git a/admin-pc/src/views/promotion/CommonPromotionList.vue b/admin-pc/src/views/promotion/CommonPromotionList.vue new file mode 100644 index 0000000..f2dcbad --- /dev/null +++ b/admin-pc/src/views/promotion/CommonPromotionList.vue @@ -0,0 +1,211 @@ + + + + \ No newline at end of file diff --git a/admin-pc/src/views/promotion/modules/CommonPromotionForm.vue b/admin-pc/src/views/promotion/modules/CommonPromotionForm.vue new file mode 100644 index 0000000..89a0fc2 --- /dev/null +++ b/admin-pc/src/views/promotion/modules/CommonPromotionForm.vue @@ -0,0 +1,124 @@ + + + \ No newline at end of file diff --git a/admin-pc/src/views/promotion/modules/CommonPromotionModal.Style#Drawer.vue b/admin-pc/src/views/promotion/modules/CommonPromotionModal.Style#Drawer.vue new file mode 100644 index 0000000..6af293d --- /dev/null +++ b/admin-pc/src/views/promotion/modules/CommonPromotionModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/admin-pc/src/views/promotion/modules/CommonPromotionModal.vue b/admin-pc/src/views/promotion/modules/CommonPromotionModal.vue new file mode 100644 index 0000000..a7fc45b --- /dev/null +++ b/admin-pc/src/views/promotion/modules/CommonPromotionModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java index c31dcb6..7e4c27e 100644 --- a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java +++ b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java @@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -274,4 +275,8 @@ public class HanHaiMember implements Serializable { @ApiModelProperty(value = "推广官类型") @Dict(dictTable = "common_distribution_ratio", dicCode = "id", dicText = "title") private java.lang.String isTuiType; + + //推广官类型名字 + @TableField(exist = false) + private java.lang.String isTuiTypeTitle; } diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletOrderTeamController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletOrderTeamController.java index 39c7562..f8fc3e4 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletOrderTeamController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletOrderTeamController.java @@ -71,7 +71,6 @@ public class AppletOrderTeamController { } //管理员：修改子订单信息-价格 - @ApiOperation(value="管理员：修改子订单信息", notes="管理员：修改子订单信息") @GetMapping(value = "/updateOrder") public Result updateOrderPrice(@RequestHeader("X-Access-Token")String token, CommonOrder commonOrder) { diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java index 9ff552a..102e863 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java @@ -15,6 +15,8 @@ import org.jeecg.common.util.RedisUtil; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.commonConfig.entity.CommonConfig; import org.jeecg.modules.commonConfig.service.ICommonConfigService; +import org.jeecg.modules.commonDistributionRatio.entity.CommonDistributionRatio; +import org.jeecg.modules.commonDistributionRatio.service.ICommonDistributionRatioService; import org.jeecg.modules.commonMoneyLog.entity.CommonMoneyLog; import org.jeecg.modules.commonMoneyLog.service.ICommonMoneyLogService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; @@ -60,6 +62,8 @@ public class AppletLoginServiceImpl implements AppletLoginService { private ICommonConfigService commonConfigService; @Resource private ICommonMoneyLogService commonMoneyLogService; + @Resource + private ICommonDistributionRatioService commonDistributionRatioService; @@ -211,22 +215,30 @@ public class AppletLoginServiceImpl implements AppletLoginService { @Override public Result getUserByToken(String token){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //根据用户标识查询用户信息 hanHaiMember = memberService.getById(hanHaiMember.getId()); + + if ("Y".equals(hanHaiMember.getIsUser()) && StringUtils.isNotBlank(hanHaiMember.getIsTuiType())){ + CommonDistributionRatio ratio = commonDistributionRatioService.getById(hanHaiMember.getIsTuiType()); + hanHaiMember.setIsTuiTypeTitle(ratio.getTitle()); + } + //查询我的所有的提现记录 List commonMoneyLogs = commonMoneyLogService.lambdaQuery() .eq(CommonMoneyLog::getTitle,"用户提现") .eq(CommonMoneyLog::getUserId,hanHaiMember.getId()).list(); + //如果数据不为空 if (commonMoneyLogs.size()>0){ //计算提现总金额 BigDecimal totalMoney = commonMoneyLogs.stream().map(CommonMoneyLog::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add); hanHaiMember.setIntegerPrice(totalMoney); - return Result.OK("个人信息查询成功",hanHaiMember); }else{ hanHaiMember.setIntegerPrice(BigDecimal.ZERO); - return Result.OK("个人信息查询成功",hanHaiMember); } + + return Result.OK("个人信息查询成功",hanHaiMember); } //修改用户信息 diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java index 06407df..f635b38 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java @@ -175,8 +175,9 @@ public class AppletOrderServiceImpl implements AppletOrderService { if(commonOrder.getState() == 0){ commonOrder.setState(3);//取消订单 commonOrderService.updateById(commonOrder); + return Result.OK("取消订单成功"); } - return Result.OK("取消订单成功"); + return Result.error("已取件后联系客服取消"); } @@ -222,11 +223,11 @@ public class AppletOrderServiceImpl implements AppletOrderService { if (commonShop.getPrice() != null){ minEstimatedPrice = commonShop.getPrice().multiply(new BigDecimal(sku.getNum())); - minEstimatedPriceSum.add(commonShop.getPrice().multiply(new BigDecimal(sku.getNum()))); + minEstimatedPriceSum = minEstimatedPriceSum.add(commonShop.getPrice().multiply(new BigDecimal(sku.getNum()))); } if (commonShop.getMaxPrice() != null){ maxEstimatedPrice = commonShop.getMaxPrice().multiply(new BigDecimal(sku.getNum())); - maxEstimatedPriceSum.add(commonShop.getMaxPrice().multiply(new BigDecimal(sku.getNum()))); + maxEstimatedPriceSum = maxEstimatedPriceSum.add(commonShop.getMaxPrice().multiply(new BigDecimal(sku.getNum()))); } @@ -239,7 +240,7 @@ public class AppletOrderServiceImpl implements AppletOrderService { sku.setDetails(commonShop.getService()); sku.setShopClass(commonShop.getShopClass()); sku.setCreateTime(new Date()); - sku.setEstimatedPrice("" + minEstimatedPrice+ "-" + maxEstimatedPrice); + sku.setEstimatedPrice(minEstimatedPrice.stripTrailingZeros().toPlainString() + "-" + maxEstimatedPrice.stripTrailingZeros().toPlainString()); sku.setOnePrice(commonShop.getPrice()); commonOrderService.save(sku); @@ -290,7 +291,7 @@ public class AppletOrderServiceImpl implements AppletOrderService { cityOrder.setGoTime(strTime); cityOrder.setAddressId(addressId); cityOrder.setCreateTime(new Date()); - cityOrder.setEstimatedPrice("" + minEstimatedPriceSum + "-" + maxEstimatedPriceSum); + cityOrder.setEstimatedPrice(minEstimatedPriceSum.stripTrailingZeros().toPlainString() + "-" + maxEstimatedPriceSum.stripTrailingZeros().toPlainString()); // 可以考虑在订单表中添加一个字段来记录是否包邮 // cityOrder.setFreeShipping(isFreeShipping ? "Y" : "N"); @@ -349,7 +350,7 @@ public class AppletOrderServiceImpl implements AppletOrderService { List openCityList = commonCityService.buildOpenCityTree(); // 使用 CommonAddress 服务检查地址是否在开放城市中（级别3：省市区完整匹配） - return commonAddressService.isAddressInOpenCities(address.getAddress(), openCityList, 3); + return commonAddressService.isAddressInOpenCities(address.getAddress(), openCityList, 2); } catch (Exception e) { // 如果包邮计算出错，默认不包邮 diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletPromotionServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletPromotionServiceImpl.java index 11f11c9..0dfb618 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletPromotionServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletPromotionServiceImpl.java @@ -198,7 +198,9 @@ public class AppletPromotionServiceImpl implements AppletPromotionService { // 如果启用了Redis缓存，可以取消下面注释 //redisUtil.set(cacheKey, qrCodeImageUrl, 3600); // 缓存一小时 - return this.generateAndCombineImagesFromUrl2(qrCodeBytes, backgroundImageUrl); + return qrCodeBytes; + +// return this.generateAndCombineImagesFromUrl2(qrCodeBytes, backgroundImageUrl); } catch (Exception e) { e.printStackTrace(); @@ -235,8 +237,6 @@ public class AppletPromotionServiceImpl implements AppletPromotionService { file = File.createTempFile("combined_", ".png"); ImageIO.write(backgroundImage, "png", file); - // 上传到阿里云OSS -// return this.uploadAliYunOss(Files.readAllBytes(file.toPath()), file.getName()); return Files.readAllBytes(file.toPath()); } catch (Exception e) { @@ -311,7 +311,7 @@ public class AppletPromotionServiceImpl implements AppletPromotionService { //管理员：通过推广表单申请 @Override public Result passPromotionApply(String token, String id){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); +// HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); CommonPromotion commonPromotion = commonPromotionService.getById(id); commonPromotion.setStatus(1); commonPromotionService.updateById(commonPromotion); @@ -324,9 +324,13 @@ public class AppletPromotionServiceImpl implements AppletPromotionService { .list(); if (list.size() > 0){ String tid = list.get(0).getId(); - byId.setIsTuiType(tid); - byId.setIsTuiRole("Y"); + + if (StringUtils.isBlank(byId.getIsTuiType())){ + byId.setIsTuiType(tid); + } + byId.setIsUser("Y"); } + hanHaiMemberService.updateById(byId); } return Result.OK("通过推广表单申请成功"); diff --git a/module-common/src/main/java/org/jeecg/modules/commonPromotion/controller/CommonPromotionController.java b/module-common/src/main/java/org/jeecg/modules/commonPromotion/controller/CommonPromotionController.java index bac654f..c4fc46b 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonPromotion/controller/CommonPromotionController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonPromotion/controller/CommonPromotionController.java @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.jeecg.api.service.AppletPromotionService; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; @@ -49,6 +51,8 @@ import org.jeecg.common.aspect.annotation.AutoLog; public class CommonPromotionController extends JeecgController { @Autowired private ICommonPromotionService commonPromotionService; + @Autowired + private AppletPromotionService appletPromotionService; /** * 分页列表查询 @@ -96,6 +100,11 @@ public class CommonPromotionController extends JeecgController edit(@RequestBody CommonPromotion commonPromotion) { + + if (commonPromotion.getStatus() == 1){ + appletPromotionService.passPromotionApply("", commonPromotion.getId()); + } + commonPromotionService.updateById(commonPromotion); return Result.OK("编辑成功!"); }