|
@@ -4,12 +4,10 @@ import cn.hutool.core.lang.Dict;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.github.pagehelper.PageInfo;
|
|
-import com.ruoyi.demo.entity.App;
|
|
|
|
-import com.ruoyi.demo.entity.Order;
|
|
|
|
|
|
+import com.ruoyi.demo.entity.*;
|
|
import com.ruoyi.demo.entity.bo.OrderAddBo;
|
|
import com.ruoyi.demo.entity.bo.OrderAddBo;
|
|
import com.ruoyi.demo.entity.bo.PlanBo;
|
|
import com.ruoyi.demo.entity.bo.PlanBo;
|
|
-import com.ruoyi.demo.mapper.AppMapper;
|
|
|
|
-import com.ruoyi.demo.mapper.OrderMapper;
|
|
|
|
|
|
+import com.ruoyi.demo.mapper.*;
|
|
import com.ruoyi.demo.service.OrderService;
|
|
import com.ruoyi.demo.service.OrderService;
|
|
import com.ruoyi.demo.utils.SignUtil;
|
|
import com.ruoyi.demo.utils.SignUtil;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -26,7 +24,16 @@ public class OrderServiceImpl implements OrderService {
|
|
OrderMapper orderMapper;
|
|
OrderMapper orderMapper;
|
|
@Autowired
|
|
@Autowired
|
|
AppMapper appMapper;
|
|
AppMapper appMapper;
|
|
|
|
+ @Autowired
|
|
|
|
+ StatisticsMapper statisticsMapper;
|
|
|
|
+ @Autowired
|
|
|
|
+ PlanMapper planMapper;
|
|
|
|
+ @Autowired
|
|
|
|
+ EquipmentMapper equipmentMapper;
|
|
|
|
+ @Autowired
|
|
|
|
+ DlUserMapper dlUserMapper;
|
|
|
|
|
|
|
|
+ // 获取sign——用于测试
|
|
@Override
|
|
@Override
|
|
public String getSign(OrderAddBo bo) {
|
|
public String getSign(OrderAddBo bo) {
|
|
QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
|
|
@@ -35,16 +42,14 @@ public class OrderServiceImpl implements OrderService {
|
|
if (app == null)
|
|
if (app == null)
|
|
return "error";
|
|
return "error";
|
|
Map<String,Object> params = Dict.create()
|
|
Map<String,Object> params = Dict.create()
|
|
- .set("appName",bo.getAppName())
|
|
|
|
.set("appkey",bo.getAppkey())
|
|
.set("appkey",bo.getAppkey())
|
|
-// .set("commercialId",bo.getCommercialId())
|
|
|
|
-// .set("commercialName",bo.getCommercialName())
|
|
|
|
- .set("createTime",bo.getCreateTime())
|
|
|
|
|
|
+ .set("createTime",bo.getTime())
|
|
|
|
+ .set("dealCount",bo.getDealCount())
|
|
|
|
+ .set("equipmentCode",bo.getEquipmentCode())
|
|
.set("goodsId",bo.getGoodsId())
|
|
.set("goodsId",bo.getGoodsId())
|
|
.set("goodsName",bo.getGoodsName())
|
|
.set("goodsName",bo.getGoodsName())
|
|
.set("goodsPrice",bo.getGoodsPrice())
|
|
.set("goodsPrice",bo.getGoodsPrice())
|
|
.set("orderId",bo.getOrderId())
|
|
.set("orderId",bo.getOrderId())
|
|
- .set("totalPrice",bo.getTotalPrice())
|
|
|
|
.set("userId",bo.getUserId())
|
|
.set("userId",bo.getUserId())
|
|
.set("userName",bo.getUserName())
|
|
.set("userName",bo.getUserName())
|
|
.set("userTelephone",bo.getUserTelephone())
|
|
.set("userTelephone",bo.getUserTelephone())
|
|
@@ -56,6 +61,7 @@ public class OrderServiceImpl implements OrderService {
|
|
return SignUtil.sign(params,app.getAppSecret());
|
|
return SignUtil.sign(params,app.getAppSecret());
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ // 添加订单
|
|
@Override
|
|
@Override
|
|
public int addOrder(OrderAddBo bo) {
|
|
public int addOrder(OrderAddBo bo) {
|
|
QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
|
|
@@ -64,16 +70,14 @@ public class OrderServiceImpl implements OrderService {
|
|
if (app == null)
|
|
if (app == null)
|
|
return -1;
|
|
return -1;
|
|
Map<String,Object> params = Dict.create()
|
|
Map<String,Object> params = Dict.create()
|
|
- .set("appName",bo.getAppName())
|
|
|
|
.set("appkey",bo.getAppkey())
|
|
.set("appkey",bo.getAppkey())
|
|
-// .set("commercialId",bo.getCommercialId())
|
|
|
|
-// .set("commercialName",bo.getCommercialName())
|
|
|
|
- .set("createTime",bo.getCreateTime())
|
|
|
|
|
|
+ .set("createTime",bo.getTime())
|
|
|
|
+ .set("dealCount",bo.getDealCount())
|
|
|
|
+ .set("equipmentCode",bo.getEquipmentCode())
|
|
.set("goodsId",bo.getGoodsId())
|
|
.set("goodsId",bo.getGoodsId())
|
|
.set("goodsName",bo.getGoodsName())
|
|
.set("goodsName",bo.getGoodsName())
|
|
.set("goodsPrice",bo.getGoodsPrice())
|
|
.set("goodsPrice",bo.getGoodsPrice())
|
|
.set("orderId",bo.getOrderId())
|
|
.set("orderId",bo.getOrderId())
|
|
- .set("totalPrice",bo.getTotalPrice())
|
|
|
|
.set("userId",bo.getUserId())
|
|
.set("userId",bo.getUserId())
|
|
.set("userName",bo.getUserName())
|
|
.set("userName",bo.getUserName())
|
|
.set("userTelephone",bo.getUserTelephone())
|
|
.set("userTelephone",bo.getUserTelephone())
|
|
@@ -84,9 +88,35 @@ public class OrderServiceImpl implements OrderService {
|
|
.set("state",bo.getState());
|
|
.set("state",bo.getState());
|
|
if (!SignUtil.verify(params,app.getAppSecret()))
|
|
if (!SignUtil.verify(params,app.getAppSecret()))
|
|
return -3;
|
|
return -3;
|
|
- return orderMapper.insert(new Order(bo));
|
|
|
|
|
|
+ // 验证通过后,如果用户不存在,则添加用户;否则更新用户信息
|
|
|
|
+ QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ planQueryWrapper.eq("plan_id",bo.getPlanId());
|
|
|
|
+ Plan plan = planMapper.selectOne(planQueryWrapper);
|
|
|
|
+
|
|
|
|
+ QueryWrapper<Equipment> equipmentQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ equipmentQueryWrapper.eq("equipment_code",bo.getEquipmentCode());
|
|
|
|
+ Equipment equipment = equipmentMapper.selectOne(equipmentQueryWrapper);
|
|
|
|
+
|
|
|
|
+ QueryWrapper<DlUser> userQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ userQueryWrapper.eq("user_id",bo.getUserId());
|
|
|
|
+ DlUser user = dlUserMapper.selectOne(userQueryWrapper);
|
|
|
|
+
|
|
|
|
+ if (user == null)
|
|
|
|
+ dlUserMapper.insert(new DlUser(bo,equipment));
|
|
|
|
+ else{
|
|
|
|
+ user.setEndEquipmentId(equipment.getEquipmentId());
|
|
|
|
+ user.setEndEquipmentName(equipment.getEquipmentName());
|
|
|
|
+ user.setEndEquipmentCode(equipment.getEquipmentCode());
|
|
|
|
+ user.setEndTime(bo.getTime());
|
|
|
|
+ dlUserMapper.update(user,userQueryWrapper);
|
|
|
|
+ }
|
|
|
|
+ // 添加交易行为记录
|
|
|
|
+ statisticsMapper.insert(new Statistics(bo,plan,equipment));
|
|
|
|
+ // 添加订单
|
|
|
|
+ return orderMapper.insert(new Order(bo,app));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ // 查询订单列表
|
|
@Override
|
|
@Override
|
|
public PageInfo<List<Order>> getOrderList(PlanBo bo) {
|
|
public PageInfo<List<Order>> getOrderList(PlanBo bo) {
|
|
PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
|
|
PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
|