fanli/src/main/java/com/yeshi/fanli/controller/admin/user/cloud/UserCloudAdminController.java
@@ -228,7 +228,7 @@ * @param out */ @RequestMapping(value = "getSendContent") public void getSendContent(String callback, String pid, Integer origin, PrintWriter out) { public void getSendContent(String callback, String pid, PrintWriter out) { try { List<UserCloudSendContent> list = userCloudSendContentService.getByPid(pid); if (list == null || list.size() == 0) { fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java
@@ -33,9 +33,6 @@ import com.yeshi.fanli.entity.dynamic.GoodsEvaluate; import com.yeshi.fanli.entity.goods.CommonGoods; import com.yeshi.fanli.entity.system.ConfigKeyEnum; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.exception.taobao.TaoKeApiException; import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException; import com.yeshi.fanli.exception.user.cloud.UserCloudException; import com.yeshi.fanli.exception.user.cloud.UserCloudGroupException; import com.yeshi.fanli.log.LogHelper; @@ -57,7 +54,6 @@ import com.yeshi.fanli.util.aitaoker.AitaokerApiUtil; import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory; import com.yeshi.fanli.util.suning.SuningUtil; import com.yeshi.fanli.util.taobao.TaoKeApiUtil; import com.yeshi.fanli.vo.goods.GoodsDetailVO; import com.yeshi.fanli.vo.user.cloud.CloudOrderMenuVO; import com.yeshi.fanli.vo.user.cloud.UserCloudInfoVO; @@ -479,10 +475,53 @@ try { userCloudGroupService.switchGroupState(uid, id, reslut); // 获取最新群 List<UserCloudGroup> list = userCloudGroupService.listGroupByUid(uid); if (list == null) list = new ArrayList<>(); JSONObject data = new JSONObject(); data.put("listGroup", list); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); } catch (UserCloudGroupException e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg())); } JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("操作成功")); } /** * 设置状态 * * @param callback * @param acceptData * @param uid * @param type * @param out */ @RequestMapping(value = "deleteGroup") public void switchGroupState(String callback, AcceptData acceptData, Long uid, Long id, PrintWriter out) { if (uid == null || id == null) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "参数不完整")); return; } try { userCloudGroupService.deleteGroup(uid, id); // 获取最新群 List<UserCloudGroup> list = userCloudGroupService.listGroupByUid(uid); if (list == null) list = new ArrayList<>(); JSONObject data = new JSONObject(); data.put("listGroup", list); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); } catch (UserCloudGroupException e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg())); } } /** @@ -647,7 +686,7 @@ key = StringUtil.Md5(key); redisManager.cacheCommonString(key , builder.toString() , 60*10); String link = configService.get(ConfigKeyEnum.cloudAlipayNotifyLink.getKey()) +"?key=%s"; String link = configService.get(ConfigKeyEnum.cloudAlipayJumpLink.getKey()) +"?key=%s"; JSONObject dataObject = new JSONObject(); dataObject.put("link", String.format(link, key)); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(dataObject)); fanli/src/main/java/com/yeshi/fanli/dao/user/cloud/UserCloudSendContentDao.java
@@ -1,6 +1,5 @@ package com.yeshi.fanli.dao.user.cloud; import java.util.ArrayList; import java.util.List; import org.springframework.data.mongodb.core.query.Criteria; @@ -21,15 +20,8 @@ * @return */ public List<UserCloudSendContent> getByPid(String pid) { List<Criteria> list = new ArrayList<Criteria>(); list.add(Criteria.where("pid").is(pid)); Query query = new Query(); if (list.size() > 0) { Criteria[] cas = new Criteria[list.size()]; for (int i = 0; i < list.size(); i++) cas[i] = list.get(i); query.addCriteria(new Criteria().andOperator(cas)); } query.addCriteria(Criteria.where("pid").is(pid)); return findList(query); } } fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudGroupServiceImpl.java
@@ -12,6 +12,7 @@ import com.yeshi.fanli.entity.bus.user.cloud.UserCloudGroup; import com.yeshi.fanli.exception.user.cloud.UserCloudGroupException; import com.yeshi.fanli.service.inter.user.cloud.UserCloudGroupService; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService; @@ -49,6 +50,11 @@ for (UserCloudGroup userCloudGroup: list) { if (groupId.equals(userCloudGroup.getGroupId())) { exist = true; // 群名为空 if (StringUtil.isNullOrEmpty(groupName)) { return; } // 群名字变化 if (!groupName.equals(userCloudGroup.getGroupName())) { UserCloudGroup update = new UserCloudGroup(); @@ -62,6 +68,11 @@ if (exist) return; // 群名为空 if (StringUtil.isNullOrEmpty(groupName)) { groupName = "本群未命名名称"; } UserCloudGroup cloudGroup = new UserCloudGroup(); cloudGroup.setUid(uid); @@ -103,6 +114,17 @@ userCloudGroupMapper.updateByPrimaryKeySelective(update); } @Override public void deleteGroup(long uid, long id) throws UserCloudGroupException{ UserCloudGroup cloudGroup = userCloudGroupMapper.selectByPrimaryKey(id); if (cloudGroup == null || cloudGroup.getUid() != uid) throw new UserCloudGroupException(1, "该记录已不存在"); if (cloudGroup.getUid() != uid) { throw new UserCloudGroupException(1, "该群已不存在"); } userCloudGroupMapper.deleteByPrimaryKey(id); } @Override public void deleteGroupByUid(Long uid){ fanli/src/main/java/com/yeshi/fanli/service/inter/user/cloud/UserCloudGroupService.java
@@ -58,5 +58,13 @@ */ public List<UserCloudGroup> listGroupByUid(Long uid); /** * 删除群 * @param uid * @param id * @throws UserCloudGroupException */ public void deleteGroup(long uid, long id) throws UserCloudGroupException; } fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -94,7 +94,7 @@ //优惠狗云发单群唤起关键词 public static final String YHG_CLOUD_GROUP_AWAKEN_KEY="板栗快省领优惠"; public static final String YHG_CLOUD_GROUP_AWAKEN_KEY="快省爆款推荐"; // 奖励券最高比例 public static final BigDecimal MAX_REWARD_RATE = new BigDecimal("0.31"); fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java
@@ -195,7 +195,7 @@ // 请求结果 String result = baseRequest("itaoke.robot.create.get", map); JSONObject resultJson = JSONObject.fromObject(result); if ("0000".equals(resultJson.optString("code"))) { if ("0000".equals(resultJson.optString("status"))) { resultJson = resultJson.optJSONObject("data"); Type type = new TypeToken<RobotInfoDTO>() {}.getType(); return new Gson().fromJson(resultJson.toString(), type); @@ -203,29 +203,6 @@ return null; } /** * 机器人更换微信号 * @param robotId 机器人id * @param wxid 微信号 * @return */ public static RobotInfoDTO robotChangeWeiXin(int robotId, String wxid) { // 请求参数 Map<String, String> map = new HashMap<>(); map.put("robot_id", robotId +""); map.put("wechatrobot", wxid); // 请求结果 String result = baseRequest("itaoke.robot.change.get", map); JSONObject resultJson = JSONObject.fromObject(result); if ("0000".equals(resultJson.optString("code"))) { resultJson = resultJson.optJSONObject("data"); Type type = new TypeToken<RobotInfoDTO>() {}.getType(); return new Gson().fromJson(resultJson.toString(), type); } return null; } /** @@ -242,7 +219,7 @@ // 请求结果 String result = baseRequest("itaoke.robot.change.get", map); JSONObject resultJson = JSONObject.fromObject(result); if ("0000".equals(resultJson.optString("code"))) { if ("0000".equals(resultJson.optString("status"))) { resultJson = resultJson.optJSONObject("data"); Type type = new TypeToken<RobotInfoDTO>() {}.getType(); return new Gson().fromJson(resultJson.toString(), type); @@ -263,7 +240,7 @@ // 请求结果 String result = baseRequest("itaoke.robot.delete.get", map); JSONObject resultJson = JSONObject.fromObject(result); if ("0000".equals(resultJson.optString("code"))) { if ("0000".equals(resultJson.optString("status"))) { return true; } return false; @@ -340,9 +317,14 @@ // 请求结果 String result = baseRequest("itaoke.robot.macsend.videocircle", map); JSONObject resultJson = JSONObject.fromObject(result); if ("1000".equals(resultJson.optString("code"))) { if ("0000".equals(resultJson.optString("status"))) { resultJson = resultJson.optJSONObject("data"); if (resultJson != null) { resultJson = resultJson.optJSONObject("object"); if (resultJson != null) { return resultJson.optString("id"); } } } return null; } @@ -414,7 +396,7 @@ // 请求结果 String result = baseRequest("itaoke.robot.macsend.base64", map); JSONObject resultJson = JSONObject.fromObject(result); if (resultJson.optInt("code") == 1000) { if ("0000".equals(resultJson.optString("status"))) { return true; } return false; @@ -443,7 +425,7 @@ // 请求结果 String result = baseRequest("itaoke.robot.macsend.card", map); JSONObject resultJson = JSONObject.fromObject(result); if (resultJson.optInt("code") == 1000) { if ("0000".equals(resultJson.optString("status"))) { return true; } return false;
