移动新购SIM到订单服务

device-api-service/src/main/java/com/xy/entity/DeviceSimOrders.java

@@ -1,96 +0,0 @@
-package com.xy.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 新购SIM卡订单
- * </p>
- *
- * @author 谭斌
- * @since 2024-04-03
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="DeviceSimOrders对象", description="新购SIM卡订单")
-public class DeviceSimOrders implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private String id;
-
-    @ApiModelProperty(value = "商户ID")
-    private Long mercId;
-
-    @ApiModelProperty(value = "卡类型")
-    private String simType;
-
-    @ApiModelProperty(value = "购买数量")
-    private Integer num;
-
-    @ApiModelProperty(value = "金额（卡费+快递费）")
-    private Integer money;
-
-    @ApiModelProperty(value = "备注")
-    private String note;
-
-    @ApiModelProperty(value = "支付方式")
-    private Integer payType;
-
-    @ApiModelProperty(value = "快递费金额")
-    private Integer moneyExpress;
-
-    @ApiModelProperty(value = "sim卡金额")
-    private Integer moneySim;
-
-    @ApiModelProperty(value = "状态")
-    private Integer status;
-
-    @ApiModelProperty(value = "第三方支付订单号")
-    private String payOrderId;
-
-    @ApiModelProperty(value = "第三方查询订单号")
-    private String payQueryOrderId;
-
-    @ApiModelProperty(value = "第三方交易订单号")
-    private String payBuyOrderId;
-
-    @ApiModelProperty(value = "支付时间")
-    private LocalDateTime payTime;
-
-    @ApiModelProperty(value = "快递地址")
-    private String address;
-
-    @ApiModelProperty(value = "联系人")
-    private String name;
-
-    @ApiModelProperty(value = "联系电话")
-    private String tel;
-
-    @ApiModelProperty(value = "快递方式")
-    private String express;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField(fill = FieldFill.UPDATE)
-    private LocalDateTime updateTime;
-
-
-}

device-api-service/src/main/java/com/xy/mapper/DeviceSimOrdersMapper.java

@@ -1,16 +0,0 @@
-package com.xy.mapper;
-
-import com.xy.entity.DeviceSimOrders;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 新购SIM卡订单 Mapper 接口
- * </p>
- *
- * @author 谭斌
- * @since 2024-04-03
- */
-public interface DeviceSimOrdersMapper extends BaseMapper<DeviceSimOrders> {
-
-}

device-api-service/src/main/java/com/xy/mapper/mapper/DeviceSimOrdersMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xy.mapper.DeviceSimOrdersMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.xy.entity.DeviceSimOrders">
-        <id column="id" property="id" />
-        <result column="merc_id" property="mercId" />
-        <result column="sim_type" property="simType" />
-        <result column="num" property="num" />
-        <result column="money" property="money" />
-        <result column="note" property="note" />
-        <result column="pay_type" property="payType" />
-        <result column="money_express" property="moneyExpress" />
-        <result column="money_sim" property="moneySim" />
-        <result column="status" property="status" />
-        <result column="pay_order_id" property="payOrderId" />
-        <result column="pay_query_order_id" property="payQueryOrderId" />
-        <result column="pay_buy_order_id" property="payBuyOrderId" />
-        <result column="pay_time" property="payTime" />
-        <result column="address" property="address" />
-        <result column="name" property="name" />
-        <result column="tel" property="tel" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-</mapper>

device-api-service/src/main/java/com/xy/service/DeviceSimGoodsServiceImpl.java

@@ -1,25 +1,24 @@
 package com.xy.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xy.dto.DeviceSimGoodsDto;
 import com.xy.entity.DeviceSimGoods;
 import com.xy.mapper.DeviceSimGoodsMapper;
-import com.xy.service.DeviceSimGoodsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
+import com.xy.utils.Emptys;
+import com.xy.utils.MybatisPlusQuery;
+import com.xy.utils.PageBean;
+import com.xy.utils.R;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
-import com.xy.utils.R;
-import com.xy.utils.PageBean;
-import com.xy.dto.DeviceSimGoodsDto;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.PostMapping;
-import io.swagger.annotations.ApiOperation;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.xy.utils.MybatisPlusQuery;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.validation.annotation.Validated;
-import com.xy.utils.Emptys;
 
 import static com.xy.utils.Beans.copy;
 import static com.xy.utils.PlusBeans.toIPage;
@@ -39,7 +38,7 @@ import static com.xy.utils.PlusBeans.toPageBean;
 @Api(tags = "sim卡商品")
 public class DeviceSimGoodsServiceImpl extends ServiceImpl<DeviceSimGoodsMapper, DeviceSimGoods> implements DeviceSimGoodsService {
 
-    @PostMapping("obj")
+    @Override
     @ApiOperation("对象查询")
     public R<DeviceSimGoodsDto.Vo> obj(@RequestBody DeviceSimGoodsDto.Vo vo) {
         DeviceSimGoodsDto.SelectList selectList = copy(DeviceSimGoodsDto.SelectList.class, vo);

device-api-service/src/main/java/com/xy/service/DeviceSimOrdersServiceImpl.java

@@ -1,108 +0,0 @@
-package com.xy.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xy.dto.DeviceSimGoodsDto;
-import com.xy.dto.DeviceSimOrdersDto;
-import com.xy.entity.DeviceSimOrders;
-import com.xy.mapper.DeviceSimOrdersMapper;
-import com.xy.order.EnumExpressDeliveryType;
-import com.xy.utils.Emptys;
-import com.xy.utils.MybatisPlusQuery;
-import com.xy.utils.PageBean;
-import com.xy.utils.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-import static com.xy.utils.Beans.copy;
-import static com.xy.utils.PlusBeans.toIPage;
-import static com.xy.utils.PlusBeans.toPageBean;
-
-
-/**
-* <p>
-* 新购SIM卡订单 服务实现类
-* </p>
-*
-* @author 谭斌
-* @since 2024-04-03
-*/
-@Service
-@AllArgsConstructor
-@Api(tags = "新购SIM卡订单")
-public class DeviceSimOrdersServiceImpl extends ServiceImpl<DeviceSimOrdersMapper, DeviceSimOrders> implements DeviceSimOrdersService {
-
-
-    private DeviceSimGoodsServiceImpl deviceSimGoodsService;
-
-    @PostMapping("obj")
-    @ApiOperation("对象查询")
-    public R<DeviceSimOrdersDto.Vo> obj(@RequestBody DeviceSimOrdersDto.Vo vo) {
-        DeviceSimOrdersDto.SelectList selectList = copy(DeviceSimOrdersDto.SelectList.class, vo);
-        List<DeviceSimOrdersDto.Vo> list = list(selectList).getData();
-        if(Emptys.check(list)) {
-            return R.ok(list.get(0));
-        }
-        return R.ok();
-    }
-
-    @PostMapping("list")
-    @ApiOperation("集合查询")
-    public R<List<DeviceSimOrdersDto.Vo>> list(@RequestBody DeviceSimOrdersDto.SelectList selectList) {
-        LambdaQueryWrapper<DeviceSimOrders> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(selectList, DeviceSimOrders.class).build();
-        List<DeviceSimOrders> list = list(lambdaQueryWrapper);
-        return R.ok(copy(DeviceSimOrdersDto.Vo.class, list));
-    }
-
-    @PostMapping("page")
-    @ApiOperation("分页查询")
-    public R<PageBean<DeviceSimOrdersDto.Vo>> page(@RequestBody DeviceSimOrdersDto.Page page) {
-        PageBean pageBean = page.getPage();
-        LambdaQueryWrapper<DeviceSimOrders> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceSimOrders.class).build();
-        IPage<DeviceSimOrders> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
-        return R.ok(toPageBean(DeviceSimOrdersDto.Vo.class, iPage));
-    }
-
-    @PostMapping("create")
-    @ApiOperation("创建订单")
-    public R create(@RequestBody @Validated DeviceSimOrdersDto.Save dto) {
-        //查询卡商品
-        DeviceSimGoodsDto.Vo goods = deviceSimGoodsService.obj(new DeviceSimGoodsDto.Vo().setId(dto.getSimGoodsId())).getData();
-        if(!Emptys.check(goods)){
-            return R.fail("商品不存在！");
-        }
-        //获取快递信息
-        String[] split = dto.getExpressDeliveryType().split("[_]");
-        String expressMoney = split[1];
-        String expressCode = split[0];
-        String express = EnumExpressDeliveryType.getEnum(expressCode).getMsg();
-
-        //根据商品信息封装参数
-        DeviceSimOrders save = copy(DeviceSimOrders.class, dto);
-        save.setMoney(goods.getPrice())
-                .setMoneyExpress(Integer.valueOf(expressMoney))
-                .setMoneySim(goods.getPrice())
-                .setSimType(goods.getType())
-                ;
-
-//        DeviceSimOrders saveInfo = copy(DeviceSimOrders.class, dto);
-//        save(saveInfo);
-        return R.ok();
-    }
-
-    @PostMapping("update")
-    @ApiOperation("修改")
-    public R update(@RequestBody @Validated DeviceSimOrdersDto.Update update) {
-        DeviceSimOrders updateInfo = copy(DeviceSimOrders.class, update);
-        updateById(updateInfo);
-        return R.ok();
-    }
-}

device-api/src/main/java/com/xy/dto/DeviceSimOrdersDto.java

@@ -1,140 +0,0 @@
-package com.xy.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xy.utils.PageBean;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 新购SIM卡订单
- * </p>
- *
- * @author 谭斌
- * @since 2024-04-03
- */
-public class DeviceSimOrdersDto {
-
-    @Data
-    @Accessors(chain = true)
-    public static class SelectList extends Vo {
-
-    }
-
-    @Data
-    @Accessors(chain = true)
-    public static class Page extends Vo {
-
-        @ApiModelProperty(value = "分页对象", required = true)
-        private PageBean page;
-
-    }
-
-    @Data
-    @Accessors(chain = true)
-    public static class Save {
-        @ApiModelProperty(value = "商户ID")
-        private Long mercId;
-
-        @ApiModelProperty(value = "sim卡商品ID")
-        private Long simGoodsId;
-
-        @ApiModelProperty(value = "购买数量")
-        private Integer num;
-
-        @ApiModelProperty(value = "商家备注")
-        private String mercRemark;
-
-        @ApiModelProperty(value = "快递地址")
-        private String address;
-
-        @ApiModelProperty(value = "联系人")
-        private String name;
-
-        @ApiModelProperty(value = "联系电话")
-        private String tel;
-
-        @ApiModelProperty(value = "快递类型")
-        private String expressDeliveryType;
-    }
-
-    @Data
-    @Accessors(chain = true)
-    public static class Update extends Vo {
-
-    }
-
-    @Data
-    @Accessors(chain = true)
-    public static class Vo {
-
-        @ApiModelProperty(value = "ID")
-        private String id;
-
-        @ApiModelProperty(value = "商户ID")
-        private Long mercId;
-
-        @ApiModelProperty(value = "卡类型")
-        private String simType;
-
-        @ApiModelProperty(value = "购买数量")
-        private Integer num;
-
-        @ApiModelProperty(value = "金额（卡费+快递费）")
-        private Integer money;
-
-        @ApiModelProperty(value = "支付方式")
-        private Integer payType;
-
-        @ApiModelProperty(value = "快递费金额")
-        private Integer moneyExpress;
-
-        @ApiModelProperty(value = "sim卡金额")
-        private Integer moneySim;
-
-        @ApiModelProperty(value = "状态")
-        private Integer status;
-
-        @ApiModelProperty(value = "第三方支付订单号")
-        private String payOrderId;
-
-        @ApiModelProperty(value = "第三方查询订单号")
-        private String payQueryOrderId;
-
-        @ApiModelProperty(value = "第三方交易订单号")
-        private String payBuyOrderId;
-
-        @ApiModelProperty(value = "支付时间")
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-        private LocalDateTime payTime;
-
-        @ApiModelProperty(value = "快递地址")
-        private String address;
-
-        @ApiModelProperty(value = "联系人")
-        private String name;
-
-        @ApiModelProperty(value = "联系电话")
-        private String tel;
-
-        @ApiModelProperty(value = "商家备注")
-        private String mercRemark;
-
-        @ApiModelProperty(value = "后台备注")
-        private String Remark;
-
-        @ApiModelProperty(value = "创建时间")
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-        private LocalDateTime createTime;
-
-        @ApiModelProperty(value = "更新时间")
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-        private LocalDateTime updateTime;
-
-
-    }
-
-}

device-api/src/main/java/com/xy/service/DeviceSimGoodsService.java

@@ -1,6 +1,10 @@
 package com.xy.service;
 
 import com.xy.annotate.RestMappingController;
+import com.xy.dto.DeviceSimGoodsDto;
+import com.xy.utils.R;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -12,5 +16,6 @@ import com.xy.annotate.RestMappingController;
  */
 @RestMappingController("/device-sim-goods")
 public interface DeviceSimGoodsService {
-
+    @PostMapping("obj")
+    R<DeviceSimGoodsDto.Vo> obj(@RequestBody DeviceSimGoodsDto.Vo vo);
 }

device-api/src/main/java/com/xy/service/DeviceSimOrdersService.java

@@ -1,16 +0,0 @@
-package com.xy.service;
-
-import com.xy.annotate.RestMappingController;
-
-/**
- * <p>
- * 新购SIM卡订单 服务类
- * </p>
- *
- * @author 谭斌
- * @since 2024-04-03
- */
-@RestMappingController("/device-sim-orders")
-public interface DeviceSimOrdersService {
-
-}