java/meitianmeiya.git

			@@ -194,7 +194,7 @@
			// 封装数据
			for (Map<String, Object> map : list) {
			map.put("cityCode",
			cityRegionService.getProvinceCityCountyNameByAll(cityAll, Convert.toStr(map.get("city_code"))).stream()
			cityRegionService.getProvinceCityCountyNameByAll(cityAll, Convert.toStr(map.get("agent_county_code"))).stream()
			.map(TCityRegion::getName)
			.collect(Collectors.joining("-"))
			);

			@@ -3,6 +3,7 @@
			import cn.hutool.core.date.DateUtil;
			import cn.hutool.core.lang.Assert;
			import cn.hutool.core.util.RandomUtil;
			import cn.hutool.core.util.StrUtil;
			import com.alibaba.fastjson.JSON;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			@@ -13,6 +14,7 @@
			import com.sinata.rest.core.easemob.ConstEasemobKeyPrefix;
			import com.sinata.rest.core.easemob.EasemobApi;
			import com.sinata.rest.core.easemob.HttpRequestUtil;
			import com.sinata.rest.core.util.SqlUtil;
			import com.sinata.rest.core.util.ToolUtil;
			import com.sinata.rest.modular.mall.controller.body.BodyApplySaleUser;
			import com.sinata.rest.modular.mall.controller.body.BodyUserRegister;
			@@ -437,6 +439,17 @@
			// 更新入司用户信息
			applySaleUserUpdate(body, user, mallOrder.getUserId(), mallOrder.getOrderNo());
			}
			// 当用户已申请并通过成为营销员，用户所在城市需显示营销员的城市，营销员的城市取套餐推荐人的所在城市
			MemUser saleUser = this.getById(mallOrder.getSaleUserId());
			if (saleUser != null && StrUtil.isNotBlank(saleUser.getCityCode())) {
			String province = StrUtil.sub(saleUser.getCityCode(), 0, 2) + "0000";
			String city = StrUtil.sub(saleUser.getCityCode(), 0, 4) + "00";
			String county = saleUser.getCityCode();
			user.setAgentProvinceCode(province);
			user.setAgentCityCode(city);
			user.setAgentCountyCode(county);
			user.updateById();
			}

			// if (mallOrder.getUseUserId() != null && !mallOrder.getUseUserId().equals(mallOrder.getUserId())) {
			// // 被推荐使用权益的

	meiya-admin/src/main/java/com/sinata/modular/member/controller/MemUserSalesController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	meiya-rest/src/main/java/com/sinata/rest/modular/member/service/impl/MemUserServiceImpl.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史