diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/DeviceStockController.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/DeviceStockController.java index 54071b1..8355c32 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/DeviceStockController.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/DeviceStockController.java @@ -4,11 +4,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chaozhanggui.admin.system.service.DeviceStockService; import com.chaozhanggui.common.system.config.RespBody; import com.chaozhanggui.dao.system.dao.TbPlussDeviceStockMapper; +import com.chaozhanggui.dao.system.entity.DTO.DeviceStockDTO; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -24,8 +22,10 @@ public class DeviceStockController { @Resource private DeviceStockService deviceStockService; -// @GetMapping("pageData") -// public RespBody pageData(){ -// -// } + @GetMapping("/pageData") + public RespBody pageData(@RequestParam Integer currPage, @RequestParam Integer size, DeviceStockDTO dto){ + return deviceStockService.pageData(currPage, size, dto); + } + + } diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantInfoController.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantInfoController.java index 2072ef0..d964dc7 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantInfoController.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantInfoController.java @@ -1,9 +1,12 @@ package com.chaozhanggui.admin.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.chaozhanggui.admin.system.annotation.OpLog; import com.chaozhanggui.admin.system.service.AccountService; import com.chaozhanggui.admin.system.service.MerchantInfoService; +import com.chaozhanggui.common.system.config.MsgException; import com.chaozhanggui.merchant.service.sxf.SxfMccInfoService; import com.chaozhanggui.common.system.config.RespBody; import com.chaozhanggui.dao.system.dao.TbPlussBankCodeSxfMapper; @@ -216,4 +219,19 @@ public class MerchantInfoController { public RespBody connectInfo(@PathVariable("userId") Integer userId) { return merchantInfoService.connectInfo(userId); } + + /** + * 清理进件驳回信息中的通道数据 + * + * @return + */ + @PostMapping("/clearRejectedChannel") + public RespBody clearRejectedChannel(@RequestBody String merchantCode) { + return merchantInfoService.clearRejectedChannel(merchantCode); + } + + @PostMapping("/createNewAuditData") + public RespBody createNewAuditData(@RequestBody String merchantCode) { + return merchantInfoService.createNewAuditData(merchantCode); + } } diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/interceptor/AdminWebConfig.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/interceptor/AdminWebConfig.java index b6defbb..bced4c0 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/interceptor/AdminWebConfig.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/interceptor/AdminWebConfig.java @@ -22,6 +22,6 @@ public class AdminWebConfig implements WebMvcConfigurer { registry.addInterceptor(new LoginInterceptor(redisUtil)) .addPathPatterns() // 如果有静态资源的时候可以在这个地方放行 - .excludePathPatterns("/","/user/doLogin","/agency/mytest","/agency/queryAgency","/promotion/testRequest","/promotion/testRequestBoolean","/agency/sendmessage"); + .excludePathPatterns("/","/user/doLogin","/agency/mytest","/agency/queryAgency","/promotion/testRequest","/promotion/testRequestBoolean","/agency/sendmessage","/Alipay/pay"); } } diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/DeviceStockService.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/DeviceStockService.java index f3ead71..8d1dcd4 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/DeviceStockService.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/DeviceStockService.java @@ -1,6 +1,25 @@ package com.chaozhanggui.admin.system.service; +import com.chaozhanggui.common.system.config.RespBody; +import com.chaozhanggui.dao.system.dao.TbPlussDeviceSpecMapper; +import com.chaozhanggui.dao.system.dao.TbPlussDeviceStockGroupMapper; +import com.chaozhanggui.dao.system.dao.TbPlussDeviceStockMapper; +import com.chaozhanggui.dao.system.dao.TbPlussDeviceTypeMapper; +import com.chaozhanggui.dao.system.entity.DTO.DeviceStockDTO; +import com.chaozhanggui.dao.system.entity.TbPlussDeviceSpec; +import com.chaozhanggui.dao.system.entity.TbPlussDeviceStockGroup; +import com.chaozhanggui.dao.system.entity.TbPlussDeviceType; +import com.chaozhanggui.dao.system.entity.VO.DeviceStockVO; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestParam; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; /** * 库存管理 @@ -8,4 +27,67 @@ import org.springframework.stereotype.Service; */ @Service public class DeviceStockService { + @Resource + private TbPlussDeviceStockMapper deviceStockMapper; + @Resource + private TbPlussDeviceStockGroupMapper deviceStockGroupMapper; + @Resource + private TbPlussDeviceTypeMapper deviceTypeMapper; + @Resource + private TbPlussDeviceSpecMapper deviceSpecMapper; + + + public RespBody pageData(Integer pageNum,Integer pageSize, DeviceStockDTO dto){ + PageHelper.startPage(pageNum, pageSize); + + if (Objects.equals(dto.getDeviceno(), "")) { + dto.setDeviceno(null); + } + if(StringUtils.isEmpty(dto.getBindStatus())){ + dto.setBindStatus("-2"); + } + if(StringUtils.isNotEmpty(dto.getNoType())){ + if("2".equals(dto.getNoType())){ + if(StringUtils.isNotEmpty(dto.getStartDeviceNo())){ + dto.setStartSnNo(dto.getStartDeviceNo()); + dto.setStartDeviceNo(null); + } + if(StringUtils.isNotEmpty(dto.getEndDeviceNo())){ + dto.setEndSnNo(dto.getEndDeviceNo()); + dto.setEndDeviceNo(null); + } + } + } + + List deviceStockVOS = deviceStockMapper.selectPageInfo(dto); + //组装 + List resultList = new ArrayList<>(); + + List deviceStockGroupList = deviceStockGroupMapper.selectAll(); + List deviceTypeList = deviceTypeMapper.selectAll(); + List deviceSpecList = deviceSpecMapper.selectAll(); + + for (DeviceStockVO item : deviceStockVOS) { + for (TbPlussDeviceStockGroup deviceStockGroup : deviceStockGroupList) { + if (deviceStockGroup.getGroupcode().equals(item.getGroupno())) { + item.setGroupNoDesc(deviceStockGroup.getGroupname()); + } + } + + for (TbPlussDeviceType deviceType : deviceTypeList) { + if (deviceType.getCode().equals(item.getCode())) { + item.setCodeDesc(deviceType.getName()); + } + } + + for (TbPlussDeviceSpec deviceSpec : deviceSpecList) { + if (deviceSpec.getCode().equals(item.getCode()) && deviceSpec.getSpec().equals(item.getType())) { + item.setTypeDesc(deviceSpec.getSpecname()); + } + } + resultList.add(item); + } + + return new RespBody("000000",resultList); + } } diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantInfoService.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantInfoService.java index bb603bb..1e969fb 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantInfoService.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantInfoService.java @@ -3,6 +3,7 @@ package com.chaozhanggui.admin.system.service; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.chaozhanggui.common.system.config.MsgException; @@ -435,5 +436,30 @@ public class MerchantInfoService { return new RespBody("000000"); } + public RespBody clearRejectedChannel(String merchantCode){ + // 只能清理审核驳回，以及待后台审核状态下的进件记录通道信息 + merchantChannelStatusMapper.updateByClearChannel(merchantCode); + return new RespBody("000000"); + } + + public RespBody createNewAuditData(String merchantCode){ + + TbPlussMerchantChannelStatus byMerchantCodeAndStatus = merchantChannelStatusMapper.getByMerchantCodeAndStatus(merchantCode); + MsgException.checkNonNull(byMerchantCodeAndStatus, "当前已存在待审核信息"); + + TbPlussMerchantChannelStatus byMerchantCodeAndChannel = merchantChannelStatusMapper.getByMerchantCodeAndChannel(merchantCode); + MsgException.checkNonNull(byMerchantCodeAndChannel, "当前D1通道存在未完成进件数据"); + + Integer countByMerchantCode = merchantChannelStatusMapper.getCountByMerchantCode(merchantCode); + MsgException.check(countByMerchantCode >= 2, "当前已进件两个通道"); + + TbPlussMerchantChannelStatus mcs = new TbPlussMerchantChannelStatus(); + mcs.setMerchantcode(merchantCode); + mcs.setStatus(TbPlussMerchantChannelStatus.AUDIT_STATUS_EXAMINING); + mcs.setThirdstatus(TbPlussMerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING); + merchantChannelStatusMapper.updateByPrimaryKeySelective(mcs); + + return new RespBody("000000"); + } } diff --git a/newadmin/admin/src/main/resources/application-dev.yml b/newadmin/admin/src/main/resources/application-dev.yml index e87c7e5..a859188 100644 --- a/newadmin/admin/src/main/resources/application-dev.yml +++ b/newadmin/admin/src/main/resources/application-dev.yml @@ -2,7 +2,7 @@ spring: datasource: url: jdbc:mysql://101.37.12.135:3306/ysk_test?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=CTT&useSSL=false username: ysk_test - password: CZGmysqlroot@123 + password: mysqlroot@123 driver-class-name: com.mysql.cj.jdbc.Driver initialSize: 5 minIdle: 5 diff --git a/newadmin/admin/src/main/resources/application-test.yml b/newadmin/admin/src/main/resources/application-test.yml index f22b76f..a11283c 100644 --- a/newadmin/admin/src/main/resources/application-test.yml +++ b/newadmin/admin/src/main/resources/application-test.yml @@ -2,7 +2,7 @@ spring: datasource: url: jdbc:mysql://127.0.0.1:3306/ysk_test?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=CTT&useSSL=false username: ysk_test - password: CZGmysqlroot@123 + password: mysqlroot@123 driver-class-name: com.mysql.cj.jdbc.Driver initialSize: 5 minIdle: 5 diff --git a/newadmin/admin/src/main/resources/application.yml b/newadmin/admin/src/main/resources/application.yml index aa5fb84..aa19ac9 100644 --- a/newadmin/admin/src/main/resources/application.yml +++ b/newadmin/admin/src/main/resources/application.yml @@ -8,7 +8,7 @@ server: # 指定日志级别 把springboot的所有日志修改成为debug logging: level: - root: debug + root: info mybatis: configuration: map-underscore-to-camel-case: true @@ -32,6 +32,10 @@ alipay-config: alipayCertPublicKeyPath: /home/www/service/key/alipayCertPublicKey_RSA2.crt alipayRootCertPath: /home/www/service/key/alipayRootCert.crt + alipayWebAppId: 2021003175619219 + privateKeyWeb: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCInywsrhhiSNj7jjOB4/zL79pAaLzoYOuOqHeQELxgXrVFmpqJ7y76wniu4nrHKfp4jQVIHw4+IkBsTNwABTPiryVzAQ4ydb/opzn4zblWRB4S7mAgnc2wqO4FMcwSOiHh7uPFAqvB8oZmEizlbXIJSiDFd3rqG2l8ZADjwuwM0nue1fUJLu65d2B6NDFgBIa11enkrNyX9uPiaeIFW62lvTN1W2AUqTJLvfko5ejExGUDkie6g5W5MIvUSKfq7sDkpt5IoQCooBzjJJ/Ckfw/rJlqoPDFzUSiANBABwu0jAJ42MGYdJ8+dyDDUNla20xmMjXbRtUe5roVzJrrgMjFAgMBAAECggEAPKPx9o77sbxF2zod8JxiW57Fj+stVjOWuoZaM27KPjgrW46o42pvvsvMx0stVfNzAkkNvBpUtw167Nccm0Gz6vz0sVwZkhojqT94gs/FYN3xP1PhBPkmEDCbHWEiBEEbQu5G2O47kGV2dB3DIb53bFoju6Ixw3GRW64DmxSss2+ZsErAWPBwbxIbUDGzIxtGhuWrvWX6pSnnvs+PNNqyoisXnh4cDjrmS9qSgsgcL4D0HwNGTsG1uBeLx4g3D2vKKqhP1osEly91P0QAGzcpuvKqeJ2ZwfFMDlabeOyqRQxFW/FLT2DuY1KmBhcGx6tjDMo7EEpVJ7NHcSHYfAa6wQKBgQDzZbIAV7shEiwS6ZwLSbeMvJkWELJtmEGk/qI/01tULHmrwDh8FIjbrHZrQNXruZ+dS+RObahCKywjYVEr/g15v5vv4yA20bmUgmO27/mVj6mpwvoHYBn0H/511a6V7lopFlCA735K+liFZ6ZW+qZxV8gkZ3/ZZDUy1LSArQmg8QKBgQCPsiK+mUdvs+1ReDm09RessbastXgYvj6UWIsPHc4Mxx/6R8qgy9nt2n2u95cK2uONtpNWswpDtOeWVakuHSKHbdG7Xz0DlklHuzin2JhOBwBu36HAVDjWPF+JDcVkUz7hFWFwl0DawRijFBcr0OV6GUoUURB21xtRnrQPmK/lFQKBgHPWFE7hceedVGhz0ZX1sWtDXsAHlkNeUO+LWAB0QGTg/c7lnnw+8ZtKitkkdCrJntMniTJiMc+76De2WwFK2XL14+rY9z3ftiidnYM01l19j8uBRak47WEn0NyXo40rcLFZM1sJn9tjJbnnyFxg0dHjaxcYQtpdPIxCet06fPihAoGAfaqJ3CnsYXH3H4KG5Qxa8fpRCWWCbBEkZVOx+TxVkLMr8hOKz2i3Y93qgHOisimPS8XZwL6/QUsaJU0wsVVldw7Blp3JnDN4TrUa7R7sw4A4Dr6glLSTKDiQTCmw8PYkTXAHURHV8/le9G+DfBwqM8eeE3p5bZTdHVovmlwrp6kCgYEA7uTSOa0phZ7ts++FVdEZf9TI/B4tRuP4aT31BHs9UoCW1g01/NEEBDiHV9udq9B6Cd5onq+QFj4jiwakTNzXjhQZqgmag1TBE9VpahLxYAD5pYn/Tvm8l5vWuSKcOSwQb2lDg5R2/bmCJRV/QHRkdkAAhHGC/TrOskUCRgosUac= + PublicKeyWeb: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiJ8sLK4YYkjY+44zgeP8y+/aQGi86GDrjqh3kBC8YF61RZqaie8u+sJ4ruJ6xyn6eI0FSB8OPiJAbEzcAAUz4q8lcwEOMnW/6Kc5+M25VkQeEu5gIJ3NsKjuBTHMEjoh4e7jxQKrwfKGZhIs5W1yCUogxXd66htpfGQA48LsDNJ7ntX1CS7uuXdgejQxYASGtdXp5Kzcl/bj4mniBVutpb0zdVtgFKkyS735KOXoxMRlA5InuoOVuTCL1Ein6u7A5KbeSKEAqKAc4ySfwpH8P6yZaqDwxc1EogDQQAcLtIwCeNjBmHSfPncgw1DZWttMZjI120bVHua6Fcya64DIxQIDAQAB + parameter: ZY_ALI_APP_ID: 2021003175619219 diff --git a/newadmin/aliPay-service-api/src/main/java/com/chaozhanggui/system/config/AliPayConfig.java b/newadmin/aliPay-service-api/src/main/java/com/chaozhanggui/system/config/AliPayConfig.java index 2ff1c4c..1147b7b 100644 --- a/newadmin/aliPay-service-api/src/main/java/com/chaozhanggui/system/config/AliPayConfig.java +++ b/newadmin/aliPay-service-api/src/main/java/com/chaozhanggui/system/config/AliPayConfig.java @@ -33,4 +33,17 @@ public class AliPayConfig implements Serializable { * 阿里根证书路径 */ private String alipayRootCertPath; + + /** + * 支付宝网页支付AppID + */ + private String alipayWebAppId; + /** + * 支付宝网页支付私钥 + */ + private String privateKeyWeb; + /** + * 支付宝网页支付公钥 + */ + private String PublicKeyWeb; } diff --git a/newadmin/aliPay-service-api/src/main/java/com/chaozhanggui/system/service/AliPayService.java b/newadmin/aliPay-service-api/src/main/java/com/chaozhanggui/system/service/AliPayService.java index ce665c4..4f50264 100644 --- a/newadmin/aliPay-service-api/src/main/java/com/chaozhanggui/system/service/AliPayService.java +++ b/newadmin/aliPay-service-api/src/main/java/com/chaozhanggui/system/service/AliPayService.java @@ -1,5 +1,6 @@ package com.chaozhanggui.system.service; +import com.alibaba.fastjson.JSONObject; import com.alipay.api.AlipayApiException; import com.alipay.api.AlipayClient; import com.alipay.api.CertAlipayRequest; @@ -7,7 +8,9 @@ import com.alipay.api.DefaultAlipayClient; import com.alipay.api.domain.AlipayFundTransUniTransferModel; import com.alipay.api.domain.Participant; import com.alipay.api.request.AlipayFundTransUniTransferRequest; +import com.alipay.api.request.AlipayTradePagePayRequest; import com.alipay.api.response.AlipayFundTransUniTransferResponse; +import com.alipay.api.response.AlipayTradePagePayResponse; import com.chaozhanggui.system.config.AliPayConfig; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.context.annotation.ComponentScan; @@ -15,6 +18,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.UUID; /** * @author lyf @@ -60,5 +65,83 @@ public class AliPayService { AlipayFundTransUniTransferResponse response = alipayClient.certificateExecute(request); return response; } + public String alipayWeb(double totalAmount,String subject) throws AlipayApiException { + AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliPayConfig.getAlipayWebAppId(), + aliPayConfig.getPrivateKeyWeb(),"json","GBK",aliPayConfig.getPublicKeyWeb(),"RSA2"); + AlipayTradePagePayRequest request = new AlipayTradePagePayRequest(); + //异步接收地址，仅支持http/https，公网可访问 + request.setNotifyUrl(""); + //同步跳转地址，仅支持http/https + request.setReturnUrl("http://point.sxczgkj.cn/"); + + JSONObject bizContent = new JSONObject(); + //商户订单号，商家自定义，保持唯一性 + bizContent.put("out_trade_no", UUID.randomUUID().toString()); + //支付金额，最小值0.01元 + bizContent.put("total_amount", totalAmount); + //订单标题，不可使用特殊符号 + bizContent.put("subject", subject); + //电脑网站支付场景固定传值FAST_INSTANT_TRADE_PAY + bizContent.put("product_code", "FAST_INSTANT_TRADE_PAY"); + + request.setBizContent(bizContent.toString()); + AlipayTradePagePayResponse response = alipayClient.pageExecute(request); + if(response.isSuccess()){ + System.out.println("调用成功"); + } else { + System.out.println("调用失败"); + } + return response.getBody(); + } + + + public static void main(String[] args) throws AlipayApiException { + AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", + "2021003175619219", + "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCInywsrhhiSNj7jjOB4/zL79pAaLzoYOuOqHeQELxgXrVFmpqJ7y76wniu4nrHKfp4jQVIHw4+IkBsTNwABTPiryVzAQ4ydb/opzn4zblWRB4S7mAgnc2wqO4FMcwSOiHh7uPFAqvB8oZmEizlbXIJSiDFd3rqG2l8ZADjwuwM0nue1fUJLu65d2B6NDFgBIa11enkrNyX9uPiaeIFW62lvTN1W2AUqTJLvfko5ejExGUDkie6g5W5MIvUSKfq7sDkpt5IoQCooBzjJJ/Ckfw/rJlqoPDFzUSiANBABwu0jAJ42MGYdJ8+dyDDUNla20xmMjXbRtUe5roVzJrrgMjFAgMBAAECggEAPKPx9o77sbxF2zod8JxiW57Fj+stVjOWuoZaM27KPjgrW46o42pvvsvMx0stVfNzAkkNvBpUtw167Nccm0Gz6vz0sVwZkhojqT94gs/FYN3xP1PhBPkmEDCbHWEiBEEbQu5G2O47kGV2dB3DIb53bFoju6Ixw3GRW64DmxSss2+ZsErAWPBwbxIbUDGzIxtGhuWrvWX6pSnnvs+PNNqyoisXnh4cDjrmS9qSgsgcL4D0HwNGTsG1uBeLx4g3D2vKKqhP1osEly91P0QAGzcpuvKqeJ2ZwfFMDlabeOyqRQxFW/FLT2DuY1KmBhcGx6tjDMo7EEpVJ7NHcSHYfAa6wQKBgQDzZbIAV7shEiwS6ZwLSbeMvJkWELJtmEGk/qI/01tULHmrwDh8FIjbrHZrQNXruZ+dS+RObahCKywjYVEr/g15v5vv4yA20bmUgmO27/mVj6mpwvoHYBn0H/511a6V7lopFlCA735K+liFZ6ZW+qZxV8gkZ3/ZZDUy1LSArQmg8QKBgQCPsiK+mUdvs+1ReDm09RessbastXgYvj6UWIsPHc4Mxx/6R8qgy9nt2n2u95cK2uONtpNWswpDtOeWVakuHSKHbdG7Xz0DlklHuzin2JhOBwBu36HAVDjWPF+JDcVkUz7hFWFwl0DawRijFBcr0OV6GUoUURB21xtRnrQPmK/lFQKBgHPWFE7hceedVGhz0ZX1sWtDXsAHlkNeUO+LWAB0QGTg/c7lnnw+8ZtKitkkdCrJntMniTJiMc+76De2WwFK2XL14+rY9z3ftiidnYM01l19j8uBRak47WEn0NyXo40rcLFZM1sJn9tjJbnnyFxg0dHjaxcYQtpdPIxCet06fPihAoGAfaqJ3CnsYXH3H4KG5Qxa8fpRCWWCbBEkZVOx+TxVkLMr8hOKz2i3Y93qgHOisimPS8XZwL6/QUsaJU0wsVVldw7Blp3JnDN4TrUa7R7sw4A4Dr6glLSTKDiQTCmw8PYkTXAHURHV8/le9G+DfBwqM8eeE3p5bZTdHVovmlwrp6kCgYEA7uTSOa0phZ7ts++FVdEZf9TI/B4tRuP4aT31BHs9UoCW1g01/NEEBDiHV9udq9B6Cd5onq+QFj4jiwakTNzXjhQZqgmag1TBE9VpahLxYAD5pYn/Tvm8l5vWuSKcOSwQb2lDg5R2/bmCJRV/QHRkdkAAhHGC/TrOskUCRgosUac=" + ,"json","GBK","MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiJ8sLK4YYkjY+44zgeP8y+/aQGi86GDrjqh3kBC8YF61RZqaie8u+sJ4ruJ6xyn6eI0FSB8OPiJAbEzcAAUz4q8lcwEOMnW/6Kc5+M25VkQeEu5gIJ3NsKjuBTHMEjoh4e7jxQKrwfKGZhIs5W1yCUogxXd66htpfGQA48LsDNJ7ntX1CS7uuXdgejQxYASGtdXp5Kzcl/bj4mniBVutpb0zdVtgFKkyS735KOXoxMRlA5InuoOVuTCL1Ein6u7A5KbeSKEAqKAc4ySfwpH8P6yZaqDwxc1EogDQQAcLtIwCeNjBmHSfPncgw1DZWttMZjI120bVHua6Fcya64DIxQIDAQAB","RSA2"); + AlipayTradePagePayRequest request = new AlipayTradePagePayRequest(); + //异步接收地址，仅支持http/https，公网可访问 + request.setNotifyUrl(""); + //同步跳转地址，仅支持http/https + request.setReturnUrl(""); + + /******必传参数******/ + JSONObject bizContent = new JSONObject(); + //商户订单号，商家自定义，保持唯一性 + bizContent.put("out_trade_no", "20210817010103044"); + //支付金额，最小值0.01元 + bizContent.put("total_amount", 0.01); + //订单标题，不可使用特殊符号 + bizContent.put("subject", "测试商品"); + //电脑网站支付场景固定传值FAST_INSTANT_TRADE_PAY + bizContent.put("product_code", "FAST_INSTANT_TRADE_PAY"); + +/******可选参数******/ +//bizContent.put("time_expire", "2022-08-01 22:00:00"); + +//// 商品明细信息，按需传入 +//JSONArray goodsDetail = new JSONArray(); +//JSONObject goods1 = new JSONObject(); +//goods1.put("goods_id", "goodsNo1"); +//goods1.put("goods_name", "子商品1"); +//goods1.put("quantity", 1); +//goods1.put("price", 0.01); +//goodsDetail.add(goods1); +//bizContent.put("goods_detail", goodsDetail); + +//// 扩展信息，按需传入 +//JSONObject extendParams = new JSONObject(); +//extendParams.put("sys_service_provider_id", "2088511833207846"); +//bizContent.put("extend_params", extendParams); + + request.setBizContent(bizContent.toString()); + AlipayTradePagePayResponse response = alipayClient.pageExecute(request); + if(response.isSuccess()){ + System.out.println("调用成功"); + } else { + System.out.println("调用失败"); + } + } } diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussDeviceSpecMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussDeviceSpecMapper.java index 2dfbdb9..c9fbac0 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussDeviceSpecMapper.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussDeviceSpecMapper.java @@ -5,6 +5,8 @@ import com.chaozhanggui.dao.system.entity.TbPlussDeviceSpec; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; +import java.util.List; + @Component @Mapper public interface TbPlussDeviceSpecMapper { @@ -16,6 +18,8 @@ public interface TbPlussDeviceSpecMapper { TbPlussDeviceSpec selectByPrimaryKey(Integer id); + List selectAll(); + int updateByPrimaryKeySelective(TbPlussDeviceSpec record); int updateByPrimaryKey(TbPlussDeviceSpec record); diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussDeviceStockGroupMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussDeviceStockGroupMapper.java index 2fa196f..c8b2033 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussDeviceStockGroupMapper.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussDeviceStockGroupMapper.java @@ -5,6 +5,8 @@ import com.chaozhanggui.dao.system.entity.TbPlussDeviceStockGroup; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; +import java.util.List; + @Component @Mapper public interface TbPlussDeviceStockGroupMapper { @@ -16,6 +18,8 @@ public interface TbPlussDeviceStockGroupMapper { TbPlussDeviceStockGroup selectByPrimaryKey(Integer id); + List selectAll(); + int updateByPrimaryKeySelective(TbPlussDeviceStockGroup record); int updateByPrimaryKey(TbPlussDeviceStockGroup record); diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussDeviceStockMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussDeviceStockMapper.java index 732f525..c78de71 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussDeviceStockMapper.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussDeviceStockMapper.java @@ -1,10 +1,16 @@ package com.chaozhanggui.dao.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chaozhanggui.dao.system.entity.DTO.DeviceStockDTO; import com.chaozhanggui.dao.system.entity.TbPlussDeviceStock; +import com.chaozhanggui.dao.system.entity.VO.DeviceStockVO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; +import java.util.List; + @Component @Mapper public interface TbPlussDeviceStockMapper { @@ -16,6 +22,8 @@ public interface TbPlussDeviceStockMapper { TbPlussDeviceStock selectByPrimaryKey(Integer id); + List selectPageInfo(@Param("dto") DeviceStockDTO dto); + int updateByPrimaryKeySelective(TbPlussDeviceStock record); int updateByPrimaryKey(TbPlussDeviceStock record); diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussDeviceTypeMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussDeviceTypeMapper.java index 5aebc99..9a3be19 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussDeviceTypeMapper.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussDeviceTypeMapper.java @@ -1,10 +1,13 @@ package com.chaozhanggui.dao.system.dao; +import com.chaozhanggui.dao.system.entity.TbPlussDeviceStockGroup; import com.chaozhanggui.dao.system.entity.TbPlussDeviceType; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; +import java.util.List; + @Component @Mapper public interface TbPlussDeviceTypeMapper { @@ -16,6 +19,8 @@ public interface TbPlussDeviceTypeMapper { TbPlussDeviceType selectByPrimaryKey(Integer id); + List selectAll(); + int updateByPrimaryKeySelective(TbPlussDeviceType record); int updateByPrimaryKey(TbPlussDeviceType record); diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantChannelStatusMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantChannelStatusMapper.java index b5bcfca..580a827 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantChannelStatusMapper.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantChannelStatusMapper.java @@ -23,6 +23,8 @@ public interface TbPlussMerchantChannelStatusMapper { TbPlussMerchantChannelStatus selectByMerchantCode(@Param("merchantCode") String merchantCode, @Param("channelId") Integer channelId); int updateByPrimaryKeySelective(TbPlussMerchantChannelStatus record); + int updateBymerchantCode(TbPlussMerchantChannelStatus record); + int updateByClearChannel(@Param("merchantcode")String merchantcode); int updateByPrimaryKeyWithBLOBs(TbPlussMerchantChannelStatus record); @@ -37,6 +39,13 @@ public interface TbPlussMerchantChannelStatusMapper { TbPlussMerchantChannelStatus getByCodeNullChannel(@Param("merchantCode") String merchantCode); TbPlussMerchantChannelStatus getByMerchantCode(@Param("merchantCode") String merchantCode,@Param("channel") String channel ); + + TbPlussMerchantChannelStatus getByMerchantCodeAndStatus(@Param("merchantCode") String merchantCode); + + TbPlussMerchantChannelStatus getByMerchantCodeAndChannel(@Param("merchantCode") String merchantCode); + + Integer getCountByMerchantCode(@Param("merchantCode") String merchantCode); + List getByMerchantCodes(@Param("merchantCode") String merchantCode); List getByMerchantCodesAudit(@Param("merchantCode") String merchantCode); diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussDeviceStock.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussDeviceStock.java index 754ea65..9729ed1 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussDeviceStock.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussDeviceStock.java @@ -1,5 +1,7 @@ package com.chaozhanggui.dao.system.entity; +import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -52,6 +54,55 @@ public class TbPlussDeviceStock implements Serializable { private String transferstatus; private Date bindtime; + /** + *开始设备编号 + */ + @TableField(exist = false) + private String startSnNo; + + /** + *结束设备编号 + */ + @TableField(exist = false) + private String endSnNo; + + @TableField(exist = false) + private String actUserId; + + @TableField(exist = false) + private String buyUserId; + + public String getActUserId() { + return actUserId; + } + + public void setActUserId(String actUserId) { + this.actUserId = actUserId; + } + + public String getBuyUserId() { + return buyUserId; + } + + public void setBuyUserId(String buyUserId) { + this.buyUserId = buyUserId; + } + + public String getStartSnNo() { + return startSnNo; + } + + public void setStartSnNo(String startSnNo) { + this.startSnNo = startSnNo; + } + + public String getEndSnNo() { + return endSnNo; + } + + public void setEndSnNo(String endSnNo) { + this.endSnNo = endSnNo; + } private static final long serialVersionUID = 1L; diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussDeviceSpecMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussDeviceSpecMapper.xml index d99bae1..bfa79dd 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussDeviceSpecMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussDeviceSpecMapper.xml @@ -25,7 +25,12 @@ from tb_pluss_device_spec where id = #{id,jdbcType=INTEGER} - + + delete from tb_pluss_device_spec where id = #{id,jdbcType=INTEGER} diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussDeviceStockGroupMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussDeviceStockGroupMapper.xml index e9f4e65..23f55ca 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussDeviceStockGroupMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussDeviceStockGroupMapper.xml @@ -13,7 +13,7 @@ - id, groupCode, groupName, desc, sort, createTime, updateTime, creator, updater + id, groupCode, groupName, `desc`, sort, createTime, updateTime, creator, updater + delete from tb_pluss_device_stock_group where id = #{id,jdbcType=INTEGER} diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussDeviceStockMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussDeviceStockMapper.xml index 794ad9b..ea789c2 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussDeviceStockMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussDeviceStockMapper.xml @@ -38,7 +38,100 @@ from tb_pluss_device_stock where id = #{id,jdbcType=INTEGER} - + + delete from tb_pluss_device_stock where id = #{id,jdbcType=INTEGER} diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussDeviceTypeMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussDeviceTypeMapper.xml index ec1be86..4a074ce 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussDeviceTypeMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussDeviceTypeMapper.xml @@ -15,7 +15,7 @@ - id, code, name, desc, createTime, updateTime, creator, updater, showFlag, deviceLogo, + id, code, name, `desc`, createTime, updateTime, creator, updater, showFlag, deviceLogo, payCodeFlag - + + delete from tb_pluss_device_type where id = #{id,jdbcType=INTEGER} diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantChannelStatusMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantChannelStatusMapper.xml index 1dc4693..7f4c79f 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantChannelStatusMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantChannelStatusMapper.xml @@ -340,6 +340,83 @@ auditSuccessTime = #{auditsuccesstime,jdbcType=TIMESTAMP} where id = #{id,jdbcType=INTEGER} + + update tb_pluss_merchant_channel_status + set channel = NULL, + status = '1', + thirdStatus = '-100', + merchantId = NULL, + applicationId = NULL + where + merchantCode = #{merchantcode,jdbcType=VARCHAR} + AND (status IN (2, 0) OR (status = 1 AND thirdStatus = -999)); + + + update tb_pluss_merchant_channel_status + + + channel = #{channel,jdbcType=INTEGER}, + + + merchantCode = #{merchantcode,jdbcType=VARCHAR}, + + + merchantId = #{merchantid,jdbcType=VARCHAR}, + + + settlementType = #{settlementtype,jdbcType=VARCHAR}, + + + status = #{status,jdbcType=VARCHAR}, + + + thirdStatus = #{thirdstatus,jdbcType=VARCHAR}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + createTime = #{createtime,jdbcType=TIMESTAMP}, + + + updateTime = #{updatetime,jdbcType=TIMESTAMP}, + + + applicationId = #{applicationid,jdbcType=VARCHAR}, + + + callbackStatus = #{callbackstatus,jdbcType=VARCHAR}, + + + valid = #{valid,jdbcType=INTEGER}, + + + authorizationStatus = #{authorizationstatus,jdbcType=VARCHAR}, + + + srcMerchantNo = #{srcmerchantno,jdbcType=VARCHAR}, + + + interfaceVersion = #{interfaceversion,jdbcType=VARCHAR}, + + + aliAuthorizationStatus = #{aliauthorizationstatus,jdbcType=VARCHAR}, + + + wxCertUrl = #{wxcerturl,jdbcType=VARCHAR}, + + + aliCertUrl = #{alicerturl,jdbcType=VARCHAR}, + + + auditSuccessTime = #{auditsuccesstime,jdbcType=TIMESTAMP}, + + + extra = #{extra,jdbcType=LONGVARCHAR}, + + + where merchantCode = #{merchantcode,jdbcType=VARCHAR}, + + + + \ No newline at end of file diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussNoticeMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussNoticeMapper.xml index 81aafb1..c7f9105 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussNoticeMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussNoticeMapper.xml @@ -49,7 +49,9 @@ tb_pluss_notice WHERE typeFirst = 1 + AND typeSecond != -1 AND isDeal = 0 + OR isDeal IS NULL