Skip to content
GitLab
Commit 878a921a authored by Junling Bu's avatar Junling Bu
Browse files

Merge branch 'dev' of https://gitee.com/linlinjava/litemall

parents 50028820 950b176f
Expand all Hide whitespace changes
Inline Side-by-side
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallRegionService.java
View file @ 878a921a
......@@ -12,9 +12,17 @@ import java.util.List;
@Service
public class LitemallRegionService {
@Resource
private LitemallRegionMapper regionMapper;
public List<LitemallRegion> getAll(){
LitemallRegionExample example = new LitemallRegionExample();
byte b = 4;
example.or().andTypeNotEqualTo(b);
return regionMapper.selectByExample(example);
}
public List<LitemallRegion> queryByPid(Integer parentId) {
LitemallRegionExample example = new LitemallRegionExample();
example.or().andPidEqualTo(parentId);
......
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/GetRegionService.java 0 → 100644
View file @ 878a921a
package org.linlinjava.litemall.wx.service;
import org.linlinjava.litemall.db.domain.LitemallRegion;
import org.linlinjava.litemall.db.service.LitemallRegionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @author zhy
* @date 2019-01-17 23:07
**/
@Component
public class GetRegionService {
@Autowired
private LitemallRegionService regionService;
private static List<LitemallRegion> litemallRegions;
protected List<LitemallRegion> getLitemallRegions() {
if(litemallRegions==null){
createRegion();
}
return litemallRegions;
}
private synchronized void createRegion(){
if (litemallRegions == null) {
litemallRegions = regionService.getAll();
}
}
}
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java
View file @ 878a921a
......@@ -5,9 +5,11 @@ import org.apache.commons.logging.LogFactory;
import org.linlinjava.litemall.core.util.RegexUtil;
import org.linlinjava.litemall.core.util.ResponseUtil;
import org.linlinjava.litemall.db.domain.LitemallAddress;
import org.linlinjava.litemall.db.domain.LitemallRegion;
import org.linlinjava.litemall.db.service.LitemallAddressService;
import org.linlinjava.litemall.db.service.LitemallRegionService;
import org.linlinjava.litemall.wx.annotation.LoginUser;
import org.linlinjava.litemall.wx.service.GetRegionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
......@@ -18,6 +20,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.*;
/**
* 用户收货地址服务
......@@ -25,185 +28,208 @@ import java.util.Map;
@RestController
@RequestMapping("/wx/address")
@Validated
public class WxAddressController {
private final Log logger = LogFactory.getLog(WxAddressController.class);
@Autowired
private LitemallAddressService addressService;
@Autowired
private LitemallRegionService regionService;
/**
* 用户收货地址列表
*
* @param userId 用户ID
* @return 收货地址列表
*/
@GetMapping("list")
public Object list(@LoginUser Integer userId) {
if (userId == null) {
return ResponseUtil.unlogin();
}
List<LitemallAddress> addressList = addressService.queryByUid(userId);
List<Map<String, Object>> addressVoList = new ArrayList<>(addressList.size());
for (LitemallAddress address : addressList) {
Map<String, Object> addressVo = new HashMap<>();
addressVo.put("id", address.getId());
addressVo.put("name", address.getName());
addressVo.put("mobile", address.getMobile());
addressVo.put("isDefault", address.getIsDefault());
String province = regionService.findById(address.getProvinceId()).getName();
String city = regionService.findById(address.getCityId()).getName();
String area = regionService.findById(address.getAreaId()).getName();
String addr = address.getAddress();
String detailedAddress = province + city + area + " " + addr;
addressVo.put("detailedAddress", detailedAddress);
addressVoList.add(addressVo);
}
return ResponseUtil.ok(addressVoList);
}
/**
* 收货地址详情
*
* @param userId 用户ID
* @param id 收货地址ID
* @return 收货地址详情
*/
@GetMapping("detail")
public Object detail(@LoginUser Integer userId, @NotNull Integer id) {
if (userId == null) {
return ResponseUtil.unlogin();
}
LitemallAddress address = addressService.findById(id);
if (address == null) {
return ResponseUtil.badArgumentValue();
}
Map<Object, Object> data = new HashMap<Object, Object>();
data.put("id", address.getId());
data.put("name", address.getName());
data.put("provinceId", address.getProvinceId());
data.put("cityId", address.getCityId());
data.put("areaId", address.getAreaId());
data.put("mobile", address.getMobile());
data.put("address", address.getAddress());
data.put("isDefault", address.getIsDefault());
String pname = regionService.findById(address.getProvinceId()).getName();
data.put("provinceName", pname);
String cname = regionService.findById(address.getCityId()).getName();
data.put("cityName", cname);
String dname = regionService.findById(address.getAreaId()).getName();
data.put("areaName", dname);
return ResponseUtil.ok(data);
}
private Object validate(LitemallAddress address) {
String name = address.getName();
if (StringUtils.isEmpty(name)) {
return ResponseUtil.badArgument();
}
// 测试收货手机号码是否正确
String mobile = address.getMobile();
if (StringUtils.isEmpty(mobile)) {
return ResponseUtil.badArgument();
}
if (!RegexUtil.isMobileExact(mobile)) {
return ResponseUtil.badArgument();
}
Integer pid = address.getProvinceId();
if (pid == null) {
return ResponseUtil.badArgument();
}
if (regionService.findById(pid) == null) {
return ResponseUtil.badArgumentValue();
}
Integer cid = address.getCityId();
if (cid == null) {
return ResponseUtil.badArgument();
}
if (regionService.findById(cid) == null) {
return ResponseUtil.badArgumentValue();
}
Integer aid = address.getAreaId();
if (aid == null) {
return ResponseUtil.badArgument();
}
if (regionService.findById(aid) == null) {
return ResponseUtil.badArgumentValue();
}
String detailedAddress = address.getAddress();
if (StringUtils.isEmpty(detailedAddress)) {
return ResponseUtil.badArgument();
}
Boolean isDefault = address.getIsDefault();
if (isDefault == null) {
return ResponseUtil.badArgument();
}
return null;
}
/**
* 添加或更新收货地址
*
* @param userId 用户ID
* @param address 用户收货地址
* @return 添加或更新操作结果
*/
@PostMapping("save")
public Object save(@LoginUser Integer userId, @RequestBody LitemallAddress address) {
if (userId == null) {
return ResponseUtil.unlogin();
}
Object error = validate(address);
if (error != null) {
return error;
}
if (address.getIsDefault()) {
// 重置其他收获地址的默认选项
addressService.resetDefault(userId);
}
if (address.getId() == null || address.getId().equals(0)) {
address.setId(null);
address.setUserId(userId);
addressService.add(address);
} else {
address.setUserId(userId);
if (addressService.update(address) == 0) {
return ResponseUtil.updatedDataFailed();
}
}
return ResponseUtil.ok(address.getId());
}
/**
* 删除收货地址
*
* @param userId 用户ID
* @param address 用户收货地址，{ id: xxx }
* @return 删除操作结果
*/
@PostMapping("delete")
public Object delete(@LoginUser Integer userId, @RequestBody LitemallAddress address) {
if (userId == null) {
return ResponseUtil.unlogin();
}
Integer id = address.getId();
if (id == null) {
return ResponseUtil.badArgument();
}
addressService.delete(id);
return ResponseUtil.ok();
}
public class WxAddressController extends GetRegionService {
private final Log logger = LogFactory.getLog(WxAddressController.class);
@Autowired
private LitemallAddressService addressService;
@Autowired
private LitemallRegionService regionService;
private final static ArrayBlockingQueue<Runnable> WORK_QUEUE = new ArrayBlockingQueue<>(6);
private final static RejectedExecutionHandler HANDLER = new ThreadPoolExecutor.CallerRunsPolicy();
private static ThreadPoolExecutor executorService = new ThreadPoolExecutor(3, 6, 1000, TimeUnit.MILLISECONDS, WORK_QUEUE, HANDLER);
/**
* 用户收货地址列表
*
* @param userId 用户ID
* @return 收货地址列表
*/
@GetMapping("list")
public Object list(@LoginUser Integer userId) {
if (userId == null) {
return ResponseUtil.unlogin();
}
List<LitemallAddress> addressList = addressService.queryByUid(userId);
List<Map<String, Object>> addressVoList = new ArrayList<>(addressList.size());
List<LitemallRegion> regionList = getLitemallRegions();
for (LitemallAddress address : addressList) {
Map<String, Object> addressVo = new HashMap<>();
addressVo.put("id", address.getId());
addressVo.put("name", address.getName());
addressVo.put("mobile", address.getMobile());
addressVo.put("isDefault", address.getIsDefault());
Callable<String> provinceCallable = () -> regionList.stream().filter(region -> region.getId().equals(address.getProvinceId())).findAny().orElse(null).getName();
Callable<String> cityCallable = () -> regionList.stream().filter(region -> region.getId().equals(address.getCityId())).findAny().orElse(null).getName();
Callable<String> areaCallable = () -> regionList.stream().filter(region -> region.getId().equals(address.getAreaId())).findAny().orElse(null).getName();
FutureTask<String> provinceNameCallableTask = new FutureTask<>(provinceCallable);
FutureTask<String> cityNameCallableTask = new FutureTask<>(cityCallable);
FutureTask<String> areaNameCallableTask = new FutureTask<>(areaCallable);
executorService.submit(provinceNameCallableTask);
executorService.submit(cityNameCallableTask);
executorService.submit(areaNameCallableTask);
String detailedAddress = "";
try {
String province = provinceNameCallableTask.get();
String city = cityNameCallableTask.get();
String area = areaNameCallableTask.get();
String addr = address.getAddress();
detailedAddress = province + city + area + " " + addr;
}
catch (Exception e) {
e.printStackTrace();
}
addressVo.put("detailedAddress", detailedAddress);
addressVoList.add(addressVo);
}
return ResponseUtil.ok(addressVoList);
}
/**
* 收货地址详情
*
* @param userId 用户ID
* @param id 收货地址ID
* @return 收货地址详情
*/
@GetMapping("detail")
public Object detail(@LoginUser Integer userId, @NotNull Integer id) {
if (userId == null) {
return ResponseUtil.unlogin();
}
LitemallAddress address = addressService.findById(id);
if (address == null) {
return ResponseUtil.badArgumentValue();
}
Map<Object, Object> data = new HashMap<Object, Object>();
data.put("id", address.getId());
data.put("name", address.getName());
data.put("provinceId", address.getProvinceId());
data.put("cityId", address.getCityId());
data.put("areaId", address.getAreaId());
data.put("mobile", address.getMobile());
data.put("address", address.getAddress());
data.put("isDefault", address.getIsDefault());
String pname = regionService.findById(address.getProvinceId()).getName();
data.put("provinceName", pname);
String cname = regionService.findById(address.getCityId()).getName();
data.put("cityName", cname);
String dname = regionService.findById(address.getAreaId()).getName();
data.put("areaName", dname);
return ResponseUtil.ok(data);
}
private Object validate(LitemallAddress address) {
String name = address.getName();
if (StringUtils.isEmpty(name)) {
return ResponseUtil.badArgument();
}
// 测试收货手机号码是否正确
String mobile = address.getMobile();
if (StringUtils.isEmpty(mobile)) {
return ResponseUtil.badArgument();
}
if (!RegexUtil.isMobileExact(mobile)) {
return ResponseUtil.badArgument();
}
Integer pid = address.getProvinceId();
if (pid == null) {
return ResponseUtil.badArgument();
}
if (regionService.findById(pid) == null) {
return ResponseUtil.badArgumentValue();
}
Integer cid = address.getCityId();
if (cid == null) {
return ResponseUtil.badArgument();
}
if (regionService.findById(cid) == null) {
return ResponseUtil.badArgumentValue();
}
Integer aid = address.getAreaId();
if (aid == null) {
return ResponseUtil.badArgument();
}
if (regionService.findById(aid) == null) {
return ResponseUtil.badArgumentValue();
}
String detailedAddress = address.getAddress();
if (StringUtils.isEmpty(detailedAddress)) {
return ResponseUtil.badArgument();
}
Boolean isDefault = address.getIsDefault();
if (isDefault == null) {
return ResponseUtil.badArgument();
}
return null;
}
/**
* 添加或更新收货地址
*
* @param userId 用户ID
* @param address 用户收货地址
* @return 添加或更新操作结果
*/
@PostMapping("save")
public Object save(@LoginUser Integer userId, @RequestBody LitemallAddress address) {
if (userId == null) {
return ResponseUtil.unlogin();
}
Object error = validate(address);
if (error != null) {
return error;
}
if (address.getIsDefault()) {
// 重置其他收获地址的默认选项
addressService.resetDefault(userId);
}
if (address.getId() == null || address.getId().equals(0)) {
address.setId(null);
address.setUserId(userId);
addressService.add(address);
} else {
address.setUserId(userId);
if (addressService.update(address) == 0) {
return ResponseUtil.updatedDataFailed();
}
}
return ResponseUtil.ok(address.getId());
}
/**
* 删除收货地址
*
* @param userId 用户ID
* @param address 用户收货地址，{ id: xxx }
* @return 删除操作结果
*/
@PostMapping("delete")
public Object delete(@LoginUser Integer userId, @RequestBody LitemallAddress address) {
if (userId == null) {
return ResponseUtil.unlogin();
}
Integer id = address.getId();
if (id == null) {
return ResponseUtil.badArgument();
}
addressService.delete(id);
return ResponseUtil.ok();
}
}
\ No newline at end of file
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
View file @ 878a921a
......@@ -79,6 +79,7 @@ public class WxHomeController {
if (HomeCacheManager.hasData(HomeCacheManager.INDEX)) {
return ResponseUtil.ok(HomeCacheManager.getCacheData(HomeCacheManager.INDEX));
}
ExecutorService executorService = Executors.newFixedThreadPool(10);
Map<String, Object> data = new HashMap<>();
......@@ -137,6 +138,7 @@ public class WxHomeController {
}
//缓存数据
HomeCacheManager.loadData(HomeCacheManager.INDEX, data);
executorService.shutdown();
return ResponseUtil.ok(data);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment