From a0b4a72d4b60a431a519838be5305d00dc2214f2 Mon Sep 17 00:00:00 2001 From: liuyingfang <1357764963@qq.com> Date: Fri, 12 Jan 2024 10:07:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AlipayWebController.java | 25 ++ .../dao/system/entity/DTO/DeviceStockDTO.java | 133 +++++++++++ .../dao/system/entity/VO/DeviceStockVO.java | 222 ++++++++++++++++++ 3 files changed, 380 insertions(+) create mode 100644 newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/AlipayWebController.java create mode 100644 newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/DTO/DeviceStockDTO.java create mode 100644 newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/VO/DeviceStockVO.java diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/AlipayWebController.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/AlipayWebController.java new file mode 100644 index 0000000..15e94de --- /dev/null +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/AlipayWebController.java @@ -0,0 +1,25 @@ +package com.chaozhanggui.admin.system.controller; + +import com.alipay.api.AlipayApiException; +import com.chaozhanggui.common.system.config.RespBody; +import com.chaozhanggui.system.service.AliPayService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.math.BigDecimal; + +@CrossOrigin(origins = "*") +@RestController +@RequestMapping("/Alipay") +@Slf4j +public class AlipayWebController { + @Resource + private AliPayService aliPayService; + + @PostMapping("/pay") + public RespBody pay(@RequestParam("totalAmount") double totalAmount, @RequestParam("totalAmount") String subject) throws AlipayApiException { + return new RespBody("000000",aliPayService.alipayWeb(totalAmount, subject)); + } + +} diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/DTO/DeviceStockDTO.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/DTO/DeviceStockDTO.java new file mode 100644 index 0000000..100e12a --- /dev/null +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/DTO/DeviceStockDTO.java @@ -0,0 +1,133 @@ +package com.chaozhanggui.dao.system.entity.DTO; + +import com.chaozhanggui.dao.system.entity.TbPlussDeviceStock; + +/** + * @author lyf + */ +public class DeviceStockDTO extends TbPlussDeviceStock { + + private String userId; + + private String qrNo; + + /** + * 订单 api类型查询字段 1:表示我的设备 2：表示团队设备 + */ + private String pType; + + /** + * api 绑定状态查询 1:已绑定 -1：表示未绑定 + */ + private String bindStatus; + + /** + * 设备名称检索 + */ + private String deviceName; + + /** + * 日期时间检索 + */ + private String startDate; + + /** + * 日期时间检索 + */ + private String endDate; + + /** + * 开始设备号 + */ + private String startDeviceNo; + + /** + * 结束设备号 + */ + private String endDeviceNo; + + /** + * 编号类型 + */ + private String noType; + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getQrNo() { + return qrNo; + } + + public void setQrNo(String qrNo) { + this.qrNo = qrNo; + } + + public String getpType() { + return pType; + } + + public void setpType(String pType) { + this.pType = pType; + } + + public String getBindStatus() { + return bindStatus; + } + + public void setBindStatus(String bindStatus) { + this.bindStatus = bindStatus; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + public String getStartDeviceNo() { + return startDeviceNo; + } + + public void setStartDeviceNo(String startDeviceNo) { + this.startDeviceNo = startDeviceNo; + } + + public String getEndDeviceNo() { + return endDeviceNo; + } + + public void setEndDeviceNo(String endDeviceNo) { + this.endDeviceNo = endDeviceNo; + } + + public String getNoType() { + return noType; + } + + public void setNoType(String noType) { + this.noType = noType; + } +} diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/VO/DeviceStockVO.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/VO/DeviceStockVO.java new file mode 100644 index 0000000..205ee53 --- /dev/null +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/VO/DeviceStockVO.java @@ -0,0 +1,222 @@ +package com.chaozhanggui.dao.system.entity.VO; + +import com.chaozhanggui.common.system.util.StringUtil; +import com.chaozhanggui.dao.system.dao.TbPlussDeviceStockMapper; +import com.chaozhanggui.dao.system.entity.TbPlussDeviceStock; + +public class DeviceStockVO extends TbPlussDeviceStock { + + private String groupNoDesc; + + private String codeDesc; + + private String typeDesc; + + private String statusDesc; + + /** + * 总数量 + */ + private Integer totalNum; + + /** + * 绑定数量 + */ + private Integer bindNum; + + /** + * 未绑定数量 + */ + private Integer unbindNum; + + private String deviceName; + + private String deviceLogo; + + /** + * 划拨状态描述01:表示待接收 + */ + private String transferStatusDesc; + + /** + * 提货人 + */ + private String extractName; + + /** + * 提货人手机号 + */ + private String extractPhone; + + /** + * 持有人 + */ + private String belongName; + + /** + * 持有人手机号 + */ + private String belongPhone; + + /** + * 商户手机号 + */ + private String mercPhone; + + private String cashPlaceName; + + /** + * 付款码标签 + */ + private Boolean payCodeFlag; + + public String getStatusDesc() { + String status = this.getStatus(); + if("3".equals(status)){ + this.statusDesc = this.getActmercname(); + }else{ + this.statusDesc = "未绑定"; + } + return statusDesc; + } + + public String getTransferStatusDesc() { + String tStatus = StringUtil.isEmpty(this.getTransferstatus()) ? "" : this.getTransferstatus(); + switch (tStatus){ + case "01": + this.transferStatusDesc = "待接收"; + break; + default: + this.transferStatusDesc = ""; + } + return transferStatusDesc; + } + + public String getGroupNoDesc() { + return groupNoDesc; + } + + public void setGroupNoDesc(String groupNoDesc) { + this.groupNoDesc = groupNoDesc; + } + + public String getCodeDesc() { + return codeDesc; + } + + public void setCodeDesc(String codeDesc) { + this.codeDesc = codeDesc; + } + + public String getTypeDesc() { + return typeDesc; + } + + public void setTypeDesc(String typeDesc) { + this.typeDesc = typeDesc; + } + + public void setStatusDesc(String statusDesc) { + this.statusDesc = statusDesc; + } + + public Integer getTotalNum() { + return totalNum; + } + + public void setTotalNum(Integer totalNum) { + this.totalNum = totalNum; + } + + public Integer getBindNum() { + return bindNum; + } + + public void setBindNum(Integer bindNum) { + this.bindNum = bindNum; + } + + public Integer getUnbindNum() { + return unbindNum; + } + + public void setUnbindNum(Integer unbindNum) { + this.unbindNum = unbindNum; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getDeviceLogo() { + return deviceLogo; + } + + public void setDeviceLogo(String deviceLogo) { + this.deviceLogo = deviceLogo; + } + + public void setTransferStatusDesc(String transferStatusDesc) { + this.transferStatusDesc = transferStatusDesc; + } + + public String getExtractName() { + return extractName; + } + + public void setExtractName(String extractName) { + this.extractName = extractName; + } + + public String getExtractPhone() { + return extractPhone; + } + + public void setExtractPhone(String extractPhone) { + this.extractPhone = extractPhone; + } + + public String getBelongName() { + return belongName; + } + + public void setBelongName(String belongName) { + this.belongName = belongName; + } + + public String getBelongPhone() { + return belongPhone; + } + + public void setBelongPhone(String belongPhone) { + this.belongPhone = belongPhone; + } + + public String getMercPhone() { + return mercPhone; + } + + public void setMercPhone(String mercPhone) { + this.mercPhone = mercPhone; + } + + public String getCashPlaceName() { + return cashPlaceName; + } + + public void setCashPlaceName(String cashPlaceName) { + this.cashPlaceName = cashPlaceName; + } + + public Boolean getPayCodeFlag() { + return payCodeFlag; + } + + public void setPayCodeFlag(Boolean payCodeFlag) { + this.payCodeFlag = payCodeFlag; + } +}