hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'order_yy' of http://139.159.177.244:3000/hurui/hai-server into order_yy

Browse Source
dev-discount
袁野 2 years ago
parent bab4b8c50c 1a99e48ddf
commit a5d0fd2843
3 changed files with 50 additions and 53 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9
      hai-service/src/main/java/com/hai/service/impl/HighCouponServiceImpl.java
  2. 92
      hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

9
hai-service/src/main/java/com/hai/service/impl/HighCouponServiceImpl.java
Unescape View File

@ -1,12 +1,9 @@
package com.hai.service.impl; package com.hai.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
<<<<<<< HEAD
import com.alicp.jetcache.anno.CacheType; import com.alicp.jetcache.anno.CacheType;
import com.alicp.jetcache.anno.Cached; import com.alicp.jetcache.anno.Cached;
=======
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
>>>>>>> dev_yy
import com.hai.common.exception.ErrorCode; import com.hai.common.exception.ErrorCode;
import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.ErrorHelp;
import com.hai.common.exception.SysCode; import com.hai.common.exception.SysCode;
@ -62,17 +59,17 @@ public class HighCouponServiceImpl implements HighCouponService {
@Resource @Resource
private HighApproveService highApproveService; private HighApproveService highApproveService;
<<<<<<< HEAD
@Autowired @Autowired
private RedisTemplate redisTemplate; private RedisTemplate redisTemplate;
=======
@Resource @Resource
private HighAgentService highAgentService; private HighAgentService highAgentService;
@Resource @Resource
private HighCouponAgentService highCouponAgentService; private HighCouponAgentService highCouponAgentService;
>>>>>>> dev_yy
@Override @Override
@Transactional(propagation= Propagation.REQUIRES_NEW) @Transactional(propagation= Propagation.REQUIRES_NEW)

92
hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
Unescape View File

@ -3086,51 +3086,51 @@ public class HighOrderServiceImpl implements HighOrderService {
@Override @Override
public List<HighOrder> orderListByAgentId(Map<String, Object> map) throws Exception { public List<HighOrder> orderListByAgentId(Map<String, Object> map) throws Exception {
HighOrderExample example = new HighOrderExample(); // HighOrderExample example = new HighOrderExample();
HighOrderExample.Criteria criteria = example.createCriteria(); // HighOrderExample.Criteria criteria = example.createCriteria();
//
criteria.andOrderStatusEqualTo(3); // criteria.andOrderStatusEqualTo(3);
//
/* if (MapUtils.getLong(map , "agentId") != null) { // /* if (MapUtils.getLong(map , "agentId") != null) {
criteria.andIdentificationCodeEqualTo(MapUtils.getLong(map , "agentId")); // criteria.andIdentificationCodeEqualTo(MapUtils.getLong(map , "agentId"));
} else { // } else {
<<<<<<< HEAD //<<<<<<< HEAD
criteria.andIdentificationCodeIsNotNull(); // criteria.andIdentificationCodeIsNotNull();
}*/ // }*/
//
List<HighOrder> list = highOrderMapper.selectByExample(example); // List<HighOrder> list = highOrderMapper.selectByExample(example);
//
/* for (HighOrder order : list) { // /* for (HighOrder order : list) {
HighUser user = highUserService.findByUserId(order.getIdentificationCode()); // HighUser user = highUserService.findByUserId(order.getIdentificationCode());
order.setTime(DateUtil.date2String(order.getCreateTime() , "MM月dd日 HH:mm")); // order.setTime(DateUtil.date2String(order.getCreateTime() , "MM月dd日 HH:mm"));
List<HighChildOrder> childOrder = getChildOrderByOrder(order.getId()); // List<HighChildOrder> childOrder = getChildOrderByOrder(order.getId());
order.setGoodsTypeName("购买：" + GoodsType.getNameByType(childOrder.get(0).getGoodsType())); // order.setGoodsTypeName("购买：" + GoodsType.getNameByType(childOrder.get(0).getGoodsType()));
order.setAgentName(user.getName()); // order.setAgentName(user.getName());
}*/ // }*/
======= //=======
criteria.andIdentificationCodeIsNotNull().andIdentificationCodeNotEqualTo(60L); // criteria.andIdentificationCodeIsNotNull().andIdentificationCodeNotEqualTo(60L);
} // }
if (MapUtils.getLong(map , "code") != null) { // if (MapUtils.getLong(map , "code") != null) {
criteria.andIdentificationCodeEqualTo(MapUtils.getLong(map , "code")); // criteria.andIdentificationCodeEqualTo(MapUtils.getLong(map , "code"));
} // }
//
List<HighOrder> list = highOrderMapper.selectByExample(example); // List<HighOrder> list = highOrderMapper.selectByExample(example);
//
if (list.size() > 0) { // if (list.size() > 0) {
for (HighOrder order : list) { // for (HighOrder order : list) {
HighUser user = highUserService.findByUserId(order.getIdentificationCode()); // HighUser user = highUserService.findByUserId(order.getIdentificationCode());
order.setTime(DateUtil.date2String(order.getCreateTime() , "MM月dd日 HH:mm")); // order.setTime(DateUtil.date2String(order.getCreateTime() , "MM月dd日 HH:mm"));
List<HighChildOrder> childOrder = getChildOrderByOrder(order.getId()); // List<HighChildOrder> childOrder = getChildOrderByOrder(order.getId());
order.setGoodsTypeName("购买：" + GoodsType.getNameByType(childOrder.get(0).getGoodsType())); // order.setGoodsTypeName("购买：" + GoodsType.getNameByType(childOrder.get(0).getGoodsType()));
if (user != null) { // if (user != null) {
order.setAgentName(user.getName()); // order.setAgentName(user.getName());
} else { // } else {
order.setAgentName("暂无推广人"); // order.setAgentName("暂无推广人");
} // }
} // }
} // }
>>>>>>> dev_yy //>>>>>>> dev_yy
//
return list; return null;
} }
} }

Write Preview
Loading…
Cancel
Save