支付补充

src/main/java/com/szwl/controller/TAdminController.java

@@ -2,12 +2,15 @@ package com.szwl.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.szwl.constant.ResponseCodesEnum;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.entity.TAdmin;
 import com.szwl.model.entity.TMessageCode;
+import com.szwl.model.entity.TProportion;
 import com.szwl.service.TAdminService;
 import com.szwl.service.TMessageCodeService;
 import io.swagger.annotations.Api;
@@ -96,7 +99,8 @@ public class TAdminController {
             admin.setIsEnabled(true);
             admin.setLoginFailureCount(0);
             admin.setIsLocked(false);
-            admin.setPassword(DigestUtils.md5Hex(admin.getPassword()));
+//            admin.setPassword(DigestUtils.md5Hex(admin.getPassword()));
+            admin.setPassword(admin.getPassword());
             boolean b = tAdminService.save(admin);
             tMessageCode.setModifyDate(new Date());
             tMessageCodeService.saveOrUpdate(tMessageCode);
@@ -149,5 +153,15 @@ public class TAdminController {
 
         return R.fail(ResponseCodesEnum.A0001,"修改失败");
     }
+
+    @ApiOperation(value = "获取账号信息")
+    @GetMapping("/getAdmin")
+    public ResponseModel<IPage<TAdmin>> getAdmin(String id) {
+        LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
+        query.eq(TAdmin::getId,Long.valueOf(id));
+        Page<TAdmin> page = new Page<>(0, 10, true);
+        IPage<TAdmin> iPage = tAdminService.page(page, query);
+        return R.ok(iPage);
+    }
 }
 

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -3,6 +3,7 @@ package com.szwl.controller;
 
 import cn.com.crbank.ommo.bean.ResultMessage;
 import cn.com.crbank.ommo.esUtil.BeanUtils;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -160,6 +161,16 @@ public class TEquipmentController {
         TEquipment equipment = tEquipmentService.getById(id);
         return R.ok(equipment);
     }
+    //查找设备
+    @ApiOperation(value = "ClientId查找设备")
+    @GetMapping("/findEquipmentByClientId")
+    public ResponseModel<IPage<TEquipment>> findEquipmentByClientId(String  clientId) {
+        LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
+        query.eq(TEquipment::getClientId,clientId);
+        Page<TEquipment> page = new Page<>(0, 10, true);
+        IPage<TEquipment> iPage = tEquipmentService.page(page, query);
+        return R.ok(iPage);
+    }
     /**
      * 更新
      */

src/main/java/com/szwl/controller/TJoinpayMchController.java

@@ -2,7 +2,9 @@ package com.szwl.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.entity.TAdmin;
@@ -15,11 +17,7 @@ import com.szwl.service.TJoinpayMchService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.xml.crypto.Data;
 import java.util.Date;
@@ -111,6 +109,16 @@ public class TJoinpayMchController {
         }
     }
 
+    @ApiOperation(value = "获取提现信息")
+    @GetMapping("/getMch")
+    public ResponseModel<IPage<TJoinpayMch>> getMch(String id) {
+        LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
+        query.eq(TJoinpayMch::getAdminId,Long.valueOf(id));
+        Page<TJoinpayMch> page = new Page<>(0, 10, true);
+        IPage<TJoinpayMch> iPage = tJoinpayMchService.page(page, query);
+        return R.ok(iPage);
+    }
+
     private ResponseModel<?> createCheckMch(TJoinpayMch mch, TJoinpayMch tJoinpayMch) {
         //检查是否有更新
         int a = 0;

src/main/java/com/szwl/controller/TProductController.java

@@ -4,10 +4,15 @@ package com.szwl.controller;
 import cn.com.crbank.ommo.bean.ResultMessage;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gexin.fastjson.JSON;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.entity.TEquipment;
 import com.szwl.model.entity.TProduct;
+import com.szwl.model.entity.TPromoCode;
 import com.szwl.model.utils.PushUtils;
 import com.szwl.service.TEquipmentService;
 import com.szwl.service.TProductService;
@@ -137,5 +142,16 @@ public class TProductController {
         return ResponseEntity.status(HttpStatus.OK)
                 .body(new ResultMessage().setCode(true).setData("").setMessage("修改成功"));
     }
+
+    @ApiOperation(value = "获取商品")
+    @GetMapping("/getTProduct")
+    public ResponseModel<IPage<TProduct>> getTProduct(String  code,String equipmentId) {
+        LambdaQueryWrapper<TProduct> query = Wrappers.lambdaQuery();
+        query.eq(TProduct::getProductName,code);
+        query.eq(TProduct::getEquipmentId,Long.valueOf(equipmentId));
+        Page<TProduct> page = new Page<>(0, 10, true);
+        IPage<TProduct> iPage = tProductService.page(page, query);
+        return R.ok(iPage);
+    }
 }
 

src/main/java/com/szwl/controller/TPromoCodeController.java

@@ -0,0 +1,53 @@
+package com.szwl.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TEquipment;
+import com.szwl.model.entity.TPromoCode;
+import com.szwl.service.TEquipmentService;
+import com.szwl.service.TPromoCodeService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 优惠码列表 前端控制器
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-06-17
+ */
+@RestController
+@RequestMapping("/tPromoCode")
+public class TPromoCodeController {
+    @Autowired
+    TEquipmentService tEquipmentService;
+    @Autowired
+    TPromoCodeService promoCodeService;
+    @ApiOperation(value = "获取优惠码")
+    @GetMapping("/getTPromoCode")
+    public ResponseModel<IPage<TPromoCode>> getTPromoCode(String  code) {
+        LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
+        query.eq(TPromoCode::getCode,code);
+        Page<TPromoCode> page = new Page<>(0, 10, true);
+        IPage<TPromoCode> iPage = promoCodeService.page(page, query);
+        return R.ok(iPage);
+    }
+    @ApiOperation(value = "修改优惠码")
+    @GetMapping("/updatePromoCode")
+    public void updatePromoCode(String id,String type) {
+        TPromoCode promoCode = promoCodeService.getById(id);
+        promoCode.setIsUse(type);
+        promoCodeService.updateById(promoCode);
+    }
+}
+

src/main/java/com/szwl/controller/TProportionController.java

@@ -2,7 +2,9 @@ package com.szwl.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.entity.*;
@@ -13,11 +15,7 @@ import com.szwl.service.TProportionService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -253,5 +251,15 @@ public class TProportionController {
 //            tProportionService.save(tProportion);
         }
     }
+
+    @ApiOperation(value = "获取机器分销信息")
+    @GetMapping("/getProportion")
+    public ResponseModel<IPage<TProportion>> getProportion( String equipmentId) {
+        LambdaQueryWrapper<TProportion> query = Wrappers.lambdaQuery();
+        query.eq(TProportion::getEquipmentId,Long.valueOf(equipmentId));
+        Page<TProportion> page = new Page<>(0, 10, true);
+        IPage<TProportion> iPage = tProportionService.page(page, query);
+        return R.ok(iPage);
+    }
 }
 

src/main/java/com/szwl/mapper/TPromoCodeMapper.java

@@ -0,0 +1,16 @@
+package com.szwl.mapper;
+
+import com.szwl.model.entity.TPromoCode;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 优惠码列表 Mapper 接口
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-06-17
+ */
+public interface TPromoCodeMapper extends BaseMapper<TPromoCode> {
+
+}

src/main/java/com/szwl/mapper/xml/TPromoCodeMapper.xml

@@ -0,0 +1,26 @@
+<?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.szwl.mapper.TPromoCodeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.szwl.model.entity.TPromoCode">
+        <id column="id" property="id" />
+        <result column="admin_id" property="adminId" />
+        <result column="create_date" property="createDate" />
+        <result column="user_name" property="userName" />
+        <result column="modify_date" property="modifyDate" />
+        <result column="code" property="code" />
+        <result column="is_use" property="isUse" />
+        <result column="use_date" property="useDate" />
+        <result column="use_by" property="useBy" />
+        <result column="last_use_date" property="lastUseDate" />
+        <result column="discount" property="discount" />
+        <result column="type" property="type" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, admin_id, create_date, user_name, modify_date, code, is_use, use_date, use_by, last_use_date, discount, type
+    </sql>
+
+</mapper>

src/main/java/com/szwl/model/entity/TPromoCode.java

@@ -0,0 +1,61 @@
+package com.szwl.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 优惠码列表
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-06-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="TPromoCode对象", description="优惠码列表")
+public class TPromoCode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "所属商家;")
+    private String adminId;
+
+    private Date createDate;
+
+    private String userName;
+
+    private Date modifyDate;
+
+    @ApiModelProperty(value = "优惠码编号;")
+    private Long code;
+
+    @ApiModelProperty(value = "是否使用;")
+    private String isUse;
+
+    @ApiModelProperty(value = "使用时间;")
+    private String useDate;
+
+    @ApiModelProperty(value = "被那个机器使用;")
+    private String useBy;
+
+    @ApiModelProperty(value = "到期时间;")
+    private Date lastUseDate;
+
+    @ApiModelProperty(value = "优惠码折扣;")
+    private Float discount;
+
+    @ApiModelProperty(value = "类型，0或null:折扣优惠码；1：抵扣价优惠码")
+    private String type;
+
+
+}

src/main/java/com/szwl/service/TPromoCodeService.java

@@ -0,0 +1,16 @@
+package com.szwl.service;
+
+import com.szwl.model.entity.TPromoCode;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 优惠码列表 服务类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-06-17
+ */
+public interface TPromoCodeService extends IService<TPromoCode> {
+
+}

src/main/java/com/szwl/service/impl/TPromoCodeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.szwl.service.impl;
+
+import com.szwl.model.entity.TPromoCode;
+import com.szwl.mapper.TPromoCodeMapper;
+import com.szwl.service.TPromoCodeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 优惠码列表 服务实现类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-06-17
+ */
+@Service
+public class TPromoCodeServiceImpl extends ServiceImpl<TPromoCodeMapper, TPromoCode> implements TPromoCodeService {
+
+}