xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-03 02:36:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!67 2022-1-21 Carl

Browse Source 
Merge pull request !67 from Admin/sit-Carl-V3
This commit is contained in:
Admin 2022-01-21 06:54:58 +00:00 committed by Gitee
commit e770dc8cc3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
10 changed files with 59 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/conf/AlipayConfig.java
View File

@ -18,20 +18,20 @@ public class AlipayConfig {
//↓↓↓↓↓↓↓↓↓↓请在这里配置您的基本信息↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ //↓↓↓↓↓↓↓↓↓↓请在这里配置您的基本信息↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
// 应用ID,您的APPID，收款账号既是您的APPID对应支付宝账号 // 应用ID,您的APPID，收款账号既是您的APPID对应支付宝账号
public static String app_id = "2016101800716209"; // public static String app_id = "2016101800716209";
// public static String app_id = "2021000118668627"; public static String app_id = "2021003108690157";
// 商户私钥，您的PKCS8格式RSA2私钥 // 商户私钥，您的PKCS8格式RSA2私钥
public static String merchant_private_key = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDL8350XEsOVVSg8+cKZEl6Jx7Tp63JFimk+lldS8chZ8hv3Netz5iMemQJYH328VEB5sKkIXfDiwT1fxR2cgsGdQgmG25omKM/47QfxTRp9C4II65AlMfLsPWOWefc/enaza/gMMzB5SvvFnbpX/71aJmqU7nJvATY8MwW4SxKXKMTEI/K7+jERReR4SxtGHeFTZ892ljr7IOqJbGPnd2CXzLO05AGGhOrsmtFMh9eysD1WzcDKoADJSi26oMI49mExGo3jMF111AcXSR4CgLsx5bSoe4XtXtVbqEr/tOCt4zAWoUbu/Mviog+60eMr9qaE719aobEZP7aI5ECd86NAgMBAAECggEAXRVBtqvU2bLaUCdhYF3LJ0QpjqIt7+P8l75nAOyv8rAiS+O4UCy6TAskEx+F/im/NiXy2eQofAe7+KvKVBDStVy+nl3Qs05O2776G7HurRjz1WUrh3AgC/g06oZgC32buPA9gA3ltez5c0KGfRcCD1FxKMrTtZ3pfHXSP/L/OuRhobxCZvEL5jcWHkxgOeaL37+UQSHJe3dhCPjjj1VOxBj0RLgcAPJ8/KoglcmWHacYvPxgRo26xahrW3yCofcb+cEzG5WhCc3uBK3eSWNB1knSwl2gVMcGmN8gOPBpAneSjqv6pqWUqgAOENxi2kRZYDyTNi3JHt2ZJMdDblU8AQKBgQD2Z+CjGGloaQTvcow/dqxF4a5EAnjeUSA+cdw7ttNqvszNofjvxv9RULKIf8jgrkO9cE5X9ezqHXaWOspyXbFhmPFginH9N5tTGggrzCpeHs7jW3EZKiYJIl2MRzxMVx1jaN8EfT8Z3u/4Ca/QwPvsGNj/Er7kwqLUvkGsLeOHjQKBgQDT5G/8R/T2LqJUvFiKntfY830WVAD9vUGst68ouxfaQKj2IOlOedjvQwRcInOX3GFnQyw8ncWOIZDQOnJdYpQdjQAx3queHmv8toCp+MKyPLLYJYu4LP6ahT/9vd9G9r0QUo57n75sVOcT5tj9ZKdykchPUWe1T02LEUZPxDwjAQKBgQCnf7meZMvSpAEs3EsmIP++iUkzBhMv3Sn0COZS2VciKw2Bg2d7Z2TL2/VhAKyGvy9hKWS4On6QLvMb8F8KG1KnK5Z5r+MI5LH7bai8TQ9H591vhAt/tb0hXHEHGK2On3Fk0Dc6EAHDDl9F1x/i4izeM43e5tlJHF4gDC0MZC1VSQKBgQDMS1yZXXtV/GJw1mN7y2iK+T/qTjXibx2p/DO6TqDRwjPlkpe/HQXGsdO7TVAr48RZvk8hZnB59+zahu+LECeEUlUUv/6xZd1x+zgUKQ72sEUy1wheG6uiqcSnzfA/SFfDLAXKNZtwcW+WJaWisfAsK1h4+SDHk91MruwerjHZAQKBgH6muiaSlg6DvAUBjtxaOE0bgchI+M/j7N4289syb/6A0iTUNeTREWk2kmBT/ZeZCFtrjJx+TdVauyjkRwKx0wEuf9H+WrUM+6i5j5nTrcUEAUTjCY7IRxGk8uhNLM7cyBNvpsD4olI5j2DmRsZWnv/bNuJH2FHbvXMwanZ22vM5"; // public static String merchant_private_key = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDL8350XEsOVVSg8+cKZEl6Jx7Tp63JFimk+lldS8chZ8hv3Netz5iMemQJYH328VEB5sKkIXfDiwT1fxR2cgsGdQgmG25omKM/47QfxTRp9C4II65AlMfLsPWOWefc/enaza/gMMzB5SvvFnbpX/71aJmqU7nJvATY8MwW4SxKXKMTEI/K7+jERReR4SxtGHeFTZ892ljr7IOqJbGPnd2CXzLO05AGGhOrsmtFMh9eysD1WzcDKoADJSi26oMI49mExGo3jMF111AcXSR4CgLsx5bSoe4XtXtVbqEr/tOCt4zAWoUbu/Mviog+60eMr9qaE719aobEZP7aI5ECd86NAgMBAAECggEAXRVBtqvU2bLaUCdhYF3LJ0QpjqIt7+P8l75nAOyv8rAiS+O4UCy6TAskEx+F/im/NiXy2eQofAe7+KvKVBDStVy+nl3Qs05O2776G7HurRjz1WUrh3AgC/g06oZgC32buPA9gA3ltez5c0KGfRcCD1FxKMrTtZ3pfHXSP/L/OuRhobxCZvEL5jcWHkxgOeaL37+UQSHJe3dhCPjjj1VOxBj0RLgcAPJ8/KoglcmWHacYvPxgRo26xahrW3yCofcb+cEzG5WhCc3uBK3eSWNB1knSwl2gVMcGmN8gOPBpAneSjqv6pqWUqgAOENxi2kRZYDyTNi3JHt2ZJMdDblU8AQKBgQD2Z+CjGGloaQTvcow/dqxF4a5EAnjeUSA+cdw7ttNqvszNofjvxv9RULKIf8jgrkO9cE5X9ezqHXaWOspyXbFhmPFginH9N5tTGggrzCpeHs7jW3EZKiYJIl2MRzxMVx1jaN8EfT8Z3u/4Ca/QwPvsGNj/Er7kwqLUvkGsLeOHjQKBgQDT5G/8R/T2LqJUvFiKntfY830WVAD9vUGst68ouxfaQKj2IOlOedjvQwRcInOX3GFnQyw8ncWOIZDQOnJdYpQdjQAx3queHmv8toCp+MKyPLLYJYu4LP6ahT/9vd9G9r0QUo57n75sVOcT5tj9ZKdykchPUWe1T02LEUZPxDwjAQKBgQCnf7meZMvSpAEs3EsmIP++iUkzBhMv3Sn0COZS2VciKw2Bg2d7Z2TL2/VhAKyGvy9hKWS4On6QLvMb8F8KG1KnK5Z5r+MI5LH7bai8TQ9H591vhAt/tb0hXHEHGK2On3Fk0Dc6EAHDDl9F1x/i4izeM43e5tlJHF4gDC0MZC1VSQKBgQDMS1yZXXtV/GJw1mN7y2iK+T/qTjXibx2p/DO6TqDRwjPlkpe/HQXGsdO7TVAr48RZvk8hZnB59+zahu+LECeEUlUUv/6xZd1x+zgUKQ72sEUy1wheG6uiqcSnzfA/SFfDLAXKNZtwcW+WJaWisfAsK1h4+SDHk91MruwerjHZAQKBgH6muiaSlg6DvAUBjtxaOE0bgchI+M/j7N4289syb/6A0iTUNeTREWk2kmBT/ZeZCFtrjJx+TdVauyjkRwKx0wEuf9H+WrUM+6i5j5nTrcUEAUTjCY7IRxGk8uhNLM7cyBNvpsD4olI5j2DmRsZWnv/bNuJH2FHbvXMwanZ22vM5";
public static String merchant_private_key = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCv5/CwdRHx2iy9CWtCTW4q7xvNa23gEdEgrg+xjkhU9S6T81txJcf0cL+3KP8vgvrz/2nG14bucYyKi96pIzHx3mOF//WwewELYL8GJ9+PN+Jp4qw+ohqDaMzQY1UWeu2bHXF4pjDHxPdfzsEftPiVys6qyO3skK1cOBaW20SmIglMtM86C0yUU8uTC++n8OVzR/63YGj1sdoKSs6SrcAL1MAITNcJUEog/rvQwPStMucISvcT/2grNBrNwLJ3OPnjwsCbBJDrrRaH7Dqlmsvynjc4OySLixuXm6WJ3DsySUMco51kWP+1Z/Y2oxCOYB2a2FnmgaKUmGIu8eJRHVjJAgMBAAECggEAHBor46TwVvkKCLFGh3MjVIyanni5NwDhrhzguPcIKzp4VH6ebzcf+LdCiZptGkQMn4qAdZndHp7ZWxD5Y4AR7JggwjmgIK+l/RFZszwPhSviahQifGcdYT0O64PTBiJhb1SG2kWCqYeYFaBMTip1REkAN1yeVhrO91qmkTc6gmfNkda1ExrIQtcqA4JQBO4IUsdQ0VMV41LYkymZvewULEUGfmBgckRAmHonNhoKzOYQYp6z644VRNeUDargmfIskTETfW4dd9yqM6E5oHKqq8jO7OTEb/Qa1qep7hMDy63G/NOEdKqaUcSxExlkTKyETOgAM17rDjT09/2vo2IMmQKBgQDnWox0WNAQdxsaGBP6YoLO+yX8yRdP1WmiCR4twtVBTC1rijRPusaea4mSIcMHijrj8UBRJZRxNvNAVkdaYs+v1qZeJnVUdP/pEihqGXiAdCQ4seFnYSUr+zUdBgM+OI70ZuXMFqpfLKiKOBUjEFWYX/TapEPsZVi4oIQX2ZstcwKBgQDCpTqGKY91fCdP9DyUH0kWZol+RaBPGn5nfOQiRCNcdchq8/nx5Ydmcj+fh739ZdhXYTLhiT2D0SuPLTf0vYsE0nAJ4dC+Da5yjQHXDy7iWDMFR9AY4y8llGrSgnSMJHps9xxQJlbfm7Jkto9PyHMMW/zZmG1hXJSG3KfMGnTR0wKBgQDOAP7YCs0aHDRxw8bmSRmZHGDy+kxbtfhdZCkPLlGd1ysKewGhjPqWzcKt8IotCJTvqz5OA1xugzOOskTO4vVz6Xoyk6QeFCBbdOOvtgZquwAVy66d0w66XvEoatYwbUQ9s/IjDHugS6+3g8CufDj7eVYZ6fLhaEzb+XIlmopmqQKBgHq9EhBzuKDO70M9sc19hOr5MY5MfXAkNr0vRfRNnza4lu7KdjwRDraNKI2CXU2ioS9IfXs2vXGXvq4ER5quwzEBOeEhYi3WFsDpJdXlHx1fnJyh0hk/eQVrd4jS9odAoWqA0HvCEVnjpjRX4jrfHZ0XjHPx6FdSt93q2myb6jo9AoGAEO55XOywOuPi9SjdnPq1dgFiD+KrwxaxjapB2u0wQVdmpDtQEVo4sf30afr2zHZ/zUHGaQpAJwDnvTFhsifzkG0jmErBC+Pp9Xz217/kLN1gPqB/cs24gkyOvm4i8Xc7ofjMhRv1RDg2geFBBhZjc29hhTRwrGB0ST0XRXDsK6A=";
// 支付宝公钥,查看地址：https://openhome.alipay.com/platform/keyManage.htm 对应APPID下的支付宝公钥。 // 支付宝公钥,查看地址：https://openhome.alipay.com/platform/keyManage.htm 对应APPID下的支付宝公钥。
// public static String alipay_public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy/N+dFxLDlVUoPPnCmRJeice06etyRYppPpZXUvHIWfIb9zXrc+YjHpkCWB99vFRAebCpCF3w4sE9X8UdnILBnUIJhtuaJijP+O0H8U0afQuCCOuQJTHy7D1jlnn3P3p2s2v4DDMweUr7xZ26V/+9WiZqlO5ybwE2PDMFuEsSlyjExCPyu/oxEUXkeEsbRh3hU2fPdpY6+yDqiWxj53dgl8yztOQBhoTq7JrRTIfXsrA9Vs3AyqAAyUotuqDCOPZhMRqN4zBdddQHF0keAoC7MeW0qHuF7V7VW6hK/7TgreMwFqFG7vzL4qIPutHjK/amhO9fWqGxGT+2iORAnfOjQIDAQAB"; // public static String alipay_public_key ="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjBThgyJ3SJsx0IYUspiW+R/NDInruz2Tirr0vGmzfaNkBSDmyg2vNLmnkNrxbHApJkIRKWqGbC8yPybyjFz1nXP7oji0d/3sPKZZGdNEqOcZLaki8xPeXfOVu1T/uPH/9S084t94yQPNrD9BqehOlN+I4b/mXJ7tDGRnS2OVrQqDrPbg8pjH3OYa0bELkr71R92EHxCN4V2bSdCS1ag96/etgkodduOCmiBPVSmSRXas/GpRw92NVsRKvesWOatfjEjqST0Bz0nRuOuRnQIy1exxs/D2DHCVa6aO6TNogcPWe3C9dvxjxjw9IOiyhkGThWoWrdk8Ot+V8V8LeomcYwIDAQAB";
public static String alipay_public_key ="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjBThgyJ3SJsx0IYUspiW+R/NDInruz2Tirr0vGmzfaNkBSDmyg2vNLmnkNrxbHApJkIRKWqGbC8yPybyjFz1nXP7oji0d/3sPKZZGdNEqOcZLaki8xPeXfOVu1T/uPH/9S084t94yQPNrD9BqehOlN+I4b/mXJ7tDGRnS2OVrQqDrPbg8pjH3OYa0bELkr71R92EHxCN4V2bSdCS1ag96/etgkodduOCmiBPVSmSRXas/GpRw92NVsRKvesWOatfjEjqST0Bz0nRuOuRnQIy1exxs/D2DHCVa6aO6TNogcPWe3C9dvxjxjw9IOiyhkGThWoWrdk8Ot+V8V8LeomcYwIDAQAB"; public static String alipay_public_key ="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr+fwsHUR8dosvQlrQk1uKu8bzWtt4BHRIK4PsY5IVPUuk/NbcSXH9HC/tyj/L4L68/9pxteG7nGMioveqSMx8d5jhf/1sHsBC2C/BiffjzfiaeKsPqIag2jM0GNVFnrtmx1xeKYwx8T3X87BH7T4lcrOqsjt7JCtXDgWlttEpiIJTLTPOgtMlFPLkwvvp/Dlc0f+t2Bo9bHaCkrOkq3AC9TACEzXCVBKIP670MD0rTLnCEr3E/9oKzQazcCydzj548LAmwSQ660Wh+w6pZrL8p43ODski4sbl5ulidw7MklDHKOdZFj/tWf2NqMQjmAdmthZ5oGilJhiLvHiUR1YyQIDAQAB";
// 服务器异步通知页面路径 需http://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 // 服务器异步通知页面路径 需http://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问
// public static String notify_url = "http://工程公网访问地址/alipay.trade.page.pay-JAVA-UTF-8/notify_url.jsp"; public static String notify_url = "https://royalcanincn.escase.cn/jc/royalcanin/royalcanin/updateOrderAliPay";
public static String notify_url = "http://localhost:10086/smart-admin-api/royalcanin/notify_url";
// 页面跳转同步通知页面路径 需http://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 // 页面跳转同步通知页面路径 需http://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问
public static String return_url = "http://工程公网访问地址/alipay.trade.page.pay-JAVA-UTF-8/return_url.jsp"; public static String return_url = "https://royalcanincn.escase.cn/jc/royalcanin/royalcanin/updateOrderAliPay";
// 签名方式 // 签名方式
public static String sign_type = "RSA2"; public static String sign_type = "RSA2";
@ -40,7 +40,7 @@ public class AlipayConfig {
public static String charset = "utf-8"; public static String charset = "utf-8";
// 支付宝网关 // 支付宝网关
public static String gatewayUrl = "https://openapi.alipaydev.com/gateway.do"; public static String gatewayUrl = "https://openapi.alipay.com/gateway.do";
// 支付宝网关 // 支付宝网关
public static String log_path = "C:\\"; public static String log_path = "C:\\";

4
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java
View File

@ -59,8 +59,8 @@ public class GoodController {
@ApiOperation(value = "处方粮商品", notes = "处方粮商品查询") @ApiOperation(value = "处方粮商品", notes = "处方粮商品查询")
@PostMapping("royalcanin/goods") @PostMapping("royalcanin/goods")
public List<GoodsEntity> transferGoods(String goodsName) { public List<GoodsEntity> transferGoods(String goodsName,String petType) {
return goodService.listGoodsByNameBankNameTagUsedAge(goodsName); return goodService.listGoodsByNameBankNameTagUsedAge(goodsName,petType);
} }
@ApiOperation(value = "查询标品信息", notes = "查询标品信息") @ApiOperation(value = "查询标品信息", notes = "查询标品信息")

46
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
View File

@ -213,54 +213,24 @@ public class OrderController {
@ApiOperation(value = "支付宝支付订单", notes = "生成订单") @ApiOperation(value = "支付宝支付订单", notes = "生成订单")
@PostMapping("royalcanin/generateOrderAlipay") @PostMapping("royalcanin/generateOrderAlipay")
public ResponseDTO<String> generateOrderAliPay(@RequestBody List<OrdersEntity> ordersEntityList) throws Exception { public ResponseDTO<String> generateOrderAliPay(String orderNo) throws Exception {
StringBuffer productId = new StringBuffer(); OrderEntity ordersEntity = orderService.findByOrderId(orderNo);
StringBuffer productName = new StringBuffer(); if(ordersEntity != null) {
String memberId = "";
String mobile = "";
int buyCount = 0;
double total_fee = 0 ;
AliPayEntity aliPayEntity = new AliPayEntity(); AliPayEntity aliPayEntity = new AliPayEntity();
OrdersEntity ordersEntity = new OrdersEntity();
JSONArray orderDatilListJson = new JSONArray();
for (OrdersEntity ordersEntitys:ordersEntityList) {
//存储orderDetailList
OrderDatilListEntity orderDatilListEntity= new OrderDatilListEntity();
orderDatilListEntity.setProductName(ordersEntitys.getProductName());
orderDatilListEntity.setPcs(ordersEntitys.getBuyCount());
orderDatilListEntity.setProductCode(ordersEntitys.getProductCode());
orderDatilListEntity.setEcPrice(ordersEntitys.getPayAmount());
orderDatilListJson.add(orderDatilListEntity);
productId.append(ordersEntitys.getProductCode()+",");
productName.append(ordersEntitys.getProductName()+",");
if(ordersEntitys.getPayAmount() != "0"){
total_fee = total_fee + (Double.parseDouble(ordersEntitys.getPayAmount()) * ordersEntitys.getBuyCount()) - Double.parseDouble(ordersEntitys.getCouponAmount());
}else {
total_fee = total_fee + Double.parseDouble(ordersEntitys.getPayAmount())*ordersEntitys.getBuyCount();
}
memberId = ordersEntitys.getMemberId();
mobile = ordersEntitys.getPhoneNumber();
buyCount = buyCount + ordersEntitys.getBuyCount();
}
ordersEntity.setProductCode(productId.substring(0,productId.length()-1));
ordersEntity.setProductName(productName.substring(0,productName.length()-1));
ordersEntity.setOrderAmount(StringUtil.toString(total_fee));
ordersEntity.setMemberId(memberId);
ordersEntity.setPhoneNumber(mobile);
ordersEntity.setBuyCount(buyCount);
ordersEntity.setPayType("2"); ordersEntity.setPayType("2");
ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo());
ordersEntity.setOrderStatus("0"); ordersEntity.setOrderStatus("0");
if(orderService.generateOrder(ordersEntity,orderDatilListJson) == 1){ if (orderService.updateOrder(ordersEntity) == 1) {
aliPayEntity.setProduct_code(ordersEntity.getProductCode()); aliPayEntity.setProduct_code(ordersEntity.getProductCode());
aliPayEntity.setTotal_amount(StringUtil.toString(total_fee)); aliPayEntity.setTotal_amount(ordersEntity.getOrderAmount());
aliPayEntity.setOut_trade_no(ordersEntity.getOrderNo()); aliPayEntity.setOut_trade_no(ordersEntity.getOrderNo());
return ResponseDTO.succData(aliPayService.generateQRCode(aliPayEntity)); return ResponseDTO.succData(aliPayService.generateQRCode(aliPayEntity));
} else { } else {
return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_FAIL); return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_FAIL);
} }
}else{
return ResponseDTO.wrap(OrderResponseCodeConst.WITHOUT_ORDER);
}
} }
@PostMapping("royalcanin/updateOrderAliPay") @PostMapping("royalcanin/updateOrderAliPay")

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/dao/GoodsDao.java
View File

@ -15,6 +15,6 @@ public interface GoodsDao extends BaseMapper<OrdersEntity> {
GoodsEntity findByProductCode(String productCode); GoodsEntity findByProductCode(String productCode);
List<GoodsEntity> selectRoleIdByGoodsNameBankNameTagUsedAge(String goodsName); List<GoodsEntity> selectRoleIdByGoodsNameBankNameTagUsedAge(@Param("goodsName") String goodsName,@Param("petType")String petType);
} }

9
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/GoodsEntity.java
View File

@ -6,9 +6,12 @@ import lombok.Data;
@Data @Data
@TableName("t_good_goods") @TableName("t_good_goods")
public class GoodsEntity { public class GoodsEntity {
private String productName;
private String basePrice; private Long id;
private String name;
// private String ecPrice;
private String productCode; private String productCode;
@ -22,7 +25,7 @@ public class GoodsEntity {
private String tagUsedAge; private String tagUsedAge;
private String picFile; private String picture;
private String showImgFile; private String showImgFile;

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrderEntity.java
View File

@ -9,6 +9,8 @@ import java.util.Date;
@TableName("t_good_orders") @TableName("t_good_orders")
public class OrderEntity { public class OrderEntity {
private Long id;
private String orderNo; private String orderNo;
private String orderStatus; private String orderStatus;

4
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java
View File

@ -34,8 +34,8 @@ public class GoodService {
return goodsDao.findByProductCode(productCode); return goodsDao.findByProductCode(productCode);
} }
public List<GoodsEntity> listGoodsByNameBankNameTagUsedAge(String title){ public List<GoodsEntity> listGoodsByNameBankNameTagUsedAge(String title,String petType){
return goodsDao.selectRoleIdByGoodsNameBankNameTagUsedAge(title); return goodsDao.selectRoleIdByGoodsNameBankNameTagUsedAge(title,petType);
} }
public String brandQuery(ProductQueryEntity productQueryEntity) throws Exception { public String brandQuery(ProductQueryEntity productQueryEntity) throws Exception {

4
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java
View File

@ -269,4 +269,8 @@ public class OrderService {
return ordersDao.findByOrderId(orderNo); return ordersDao.findByOrderId(orderNo);
} }
public int updateOrder(OrderEntity orderEntity){
return ordersDao.updateById(orderEntity);
}
} }

20
smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/good/GoodMapper.xml
View File

@ -10,17 +10,25 @@
<select id="selectRoleIdByGoodsNameBankNameTagUsedAge" resultMap="GoodsEntity"> <select id="selectRoleIdByGoodsNameBankNameTagUsedAge" resultMap="GoodsEntity">
select select
* id,
product_code,
t_good_goods.name,
brand_code,
brand_name,
pet_type,
tagUsedAge,
category_name,
picture,
show_img_file
from t_good_goods from t_good_goods
<where> where isShow = 1
<if test="goodsName != null and goodsName != ''"> <if test="goodsName != null and goodsName != ''">
<bind name="goodsName" value=" '%' + goodsName +'%' "></bind> <bind name="goodsName" value=" '%' + goodsName +'%' "></bind>
AND CONCAT(product_name,brand_name,category_name,tagUsedAge) like #{goodsName} AND CONCAT(t_good_goods.name,brand_name,category_name,tagUsedAge) like #{goodsName}
</if> </if>
<if test="goodsName == null and goodsName == ''"> <if test="petType != null and petType != ''">
AND isShow = 1 AND pet_type = #{petType}
</if> </if>
</where>
</select> </select>
</mapper> </mapper>

6
smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql
View File

@ -1653,14 +1653,14 @@ PRIMARY KEY (`id`)
CREATE TABLE `t_good_goods` ( CREATE TABLE `t_good_goods` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`product_code` VARCHAR(20) NOT NULL COMMENT '标品编码', `product_code` VARCHAR(20) NOT NULL COMMENT '标品编码',
`product_name` varchar(20) DEFAULT NULL COMMENT '产品名称', `name` varchar(20) DEFAULT NULL COMMENT '产品名称',
`base_price` varchar(11) DEFAULT NULL COMMENT '价格', `ec_price` varchar(11) DEFAULT NULL COMMENT '价格',
`brand_code` varchar(11) DEFAULT NULL COMMENT '品牌编码', `brand_code` varchar(11) DEFAULT NULL COMMENT '品牌编码',
`brand_name` varchar(11) DEFAULT NULL COMMENT '品牌名称', `brand_name` varchar(11) DEFAULT NULL COMMENT '品牌名称',
`category_name` varchar(11) DEFAULT NULL COMMENT '品类', `category_name` varchar(11) DEFAULT NULL COMMENT '品类',
`pet_type` int(11) DEFAULT NULL COMMENT '宠物类型1:狗0：猫', `pet_type` int(11) DEFAULT NULL COMMENT '宠物类型1:狗0：猫',
`tagUsedAge` varchar(11) DEFAULT NULL COMMENT '适用阶段', `tagUsedAge` varchar(11) DEFAULT NULL COMMENT '适用阶段',
`pic_file` varchar(200) DEFAULT NULL COMMENT '标品头图', `picture` varchar(200) DEFAULT NULL COMMENT '标品头图',
`show_img_file` varchar(200) DEFAULT NULL COMMENT '身体头图', `show_img_file` varchar(200) DEFAULT NULL COMMENT '身体头图',
`isSales` int(11) DEFAULT NULL COMMENT '0:未销售，1：销售', `isSales` int(11) DEFAULT NULL COMMENT '0:未销售，1：销售',
`isShow` int(11) DEFAULT NULL COMMENT '0:不展示，1：展示', `isShow` int(11) DEFAULT NULL COMMENT '0:不展示，1：展示',