diff --git a/bonus-modules/bonus-smart-canteen/pom.xml b/bonus-modules/bonus-smart-canteen/pom.xml
index 0543391..9e97395 100644
--- a/bonus-modules/bonus-smart-canteen/pom.xml
+++ b/bonus-modules/bonus-smart-canteen/pom.xml
@@ -8,13 +8,13 @@
24.12.0-SNAPSHOT
4.0.0
-
+
bonus-smart-canteen
bonus-modules-smart-canteen智慧食堂
-
+
@@ -32,56 +32,56 @@
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-discovery
-
+
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-config
-
+
com.alibaba.cloud
spring-cloud-starter-alibaba-sentinel
-
+
org.springframework.boot
spring-boot-starter-actuator
-
+
io.springfox
springfox-swagger-ui
${swagger.fox.version}
-
+
com.mysql
mysql-connector-j
-
+
com.bonus
bonus-common-datasource
-
+
com.bonus
bonus-common-datascope
-
+
com.bonus
bonus-common-log
-
+
com.bonus
@@ -117,6 +117,12 @@
poi-ooxml
5.2.3
+
+
+ com.alipay.sdk
+ alipay-sdk-java
+ 4.34.0.ALL
+
@@ -126,6 +132,7 @@
org.springframework.boot
spring-boot-maven-plugin
+ 2.4.2
@@ -136,5 +143,5 @@
-
-
\ No newline at end of file
+
+
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/bootstrap-smart_canteen_dev.yml b/bonus-modules/bonus-smart-canteen/src/main/resources/bootstrap-smart_canteen_dev.yml
new file mode 100644
index 0000000..bb117d8
--- /dev/null
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/bootstrap-smart_canteen_dev.yml
@@ -0,0 +1,38 @@
+# Tomcat
+server:
+ port: 58689
+
+# Spring
+spring:
+ cloud:
+ nacos:
+ discovery:
+ # 服务注册地址测试地址
+ #server-addr: 127.0.0.1:8848
+ # 服务注册地址正式地址
+ server-addr: 127.0.0.1:18848
+ namespace: smart_canteen
+ username: nacos
+ password: jysoft@sbd1
+ config:
+ # 服务注册地址测试地址
+ #server-addr: 127.0.0.1:8848
+ # 服务注册地址正式地址
+ server-addr: 127.0.0.1:18848
+ namespace: smart_canteen
+ username: nacos
+ password: jysoft@sbd1
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+#加密组件
+jasypt:
+ encryptor:
+ password: Encrypt
+
+mybatis:
+ configuration:
+ map-underscore-to-camel-case: true
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/bootstrap.yml b/bonus-modules/bonus-smart-canteen/src/main/resources/bootstrap.yml
index 14d83c4..fca0621 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/bootstrap.yml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/bootstrap.yml
@@ -6,6 +6,7 @@ spring:
profiles:
# 环境配置
active: smart_canteen_local
+# active: smart_canteen_dev
niu:
siteurl: https://dev06.xnzn.net
niupayurl: https://dev06.xnzn.net/tengyun-api/leopen/pay/device #测试地址食堂支付
@@ -17,14 +18,24 @@ niu:
applicationidpsw: 082d5733fc44443e992071b2bc916620
sncode: 001
serialnum: 02022840
+#
#niu:
# siteurl: http://10.138.55.106:58100
# niupayurl: http://10.138.55.106:58100/tengyun-api/leopen/pay/device #地址食堂支付
# niusearchuserurl: http://10.138.55.106:58100/tengyun-api/leopen/customer/query #地址查询用户
# niupayreturnurl: http://10.138.55.106:58100/tengyun-api/leopen/pay/refund #地址食堂支付退钱
-# niuallocanteen: https://dev06.xnzn.net/tengyun-api/leopen/canteen/query #地址食堂列表
-# niualloshopll: https://dev06.xnzn.net/tengyun-api/leopen/stall/query #档口
+# niuallocanteen: http://10.138.55.106:58100/tengyun-api/leopen/canteen/query #地址食堂列表
+# niualloshopll: http://10.138.55.106:58100/tengyun-api/leopen/stall/query #档口
# applicationid: 396571655104630784
# applicationidpsw: ee75c51b4a854c43ad9a85560f024068
# sncode: 2ad34554g2 #虚拟支付设备
-# serialnum: 02022840
\ No newline at end of file
+# serialnum: 02022840
+alipay:
+ URL: https://openapi.alipay.com/gateway.do
+ PID: 2088041561080184
+ APPID: 2021002125609361
+ PRIVATE_KEY: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCpBulkHcSEQvo0GmPyYmyNOWjlCxTn/r/zrOLoXlLN44ZECgdn+Kn9E0EFjwenc/xz4H3V89KrwCA0kNX3m5Hs5qfbKIaycIQf7MvBQHPeUxQ+HeiBwg8b5vcaNy9RtS+wEuU21GF2ZU4QFpk9wYU/MWtvyt/vtj/HCL3/IGvVhcQcbumGlmBEYfoFZLez/7PfIY0SOZ7jdxCS/XGOwwBx2hMTCsMS05VPEaEwDYV5U2WN8FDDXCt6NvHPPR+BUoDON7xxaalHcN/mokpkyFmTXXAadjLVof9BJFPIYaJKmN/aRG7TWMvvZwEDKmcmeyLGiph9M4UEviiXJus/369TAgMBAAECggEAN1Bqune/YuUkSj7ErIKnMYQzHpmEyvMkUBMo4pBTmss1mjiJ+e13e7l8Utxezd74I9e4dnbnX4ttPqaTTwebNqK5FdBqXCTUKDpu55w3Du+zNSzGdQhTt3bbMLoUgzG/HGjimBHin0NBy6QJnBsjhu2eUiRbKnBC6NikjMRIZcRrAhFx65s6M6X7tRmWCybPDcWyp2Zz+nQZhCaku+qVdNz1+Jt1z3R7RZvcVNMXV0XKTu/TdMGfeGOzmyjwCEQG2iw/e7y7QkJHQDU0dKjeBCcZ9xAeGjY9m2gEK2nk1drPJ4TUEtREbZbS8lVkdjOGFQ0VMEY00KEb4JLRwam16QKBgQDlMyaqhiYAY8o1QxZ/4i2YxNHnP8Q0qQ4lyvTaVjZH3trINIXMjwtlezxwjXoMKvcgYfXFdJ9La88qsBOrqzkgePI5sX3AAGMACgUSfQmbLCfxQ4pzN2/bigWl5apFWWrfi7vmUlE+xUZmbv+HePLVslOS8RmCE79sHjwIEGQghQKBgQC8yo1xCdripF8aLMZVFDBabi3i8n6jJFzEJvY74HqoIegjSAUkmivSvw/VkGdg+bGoAinza/4zUAF7oCn/z+Q422ZQ6ldHetDioxxtumUU1Zt6ilwdpiQzMGj9B9+fHtpEaXZJjjcUQCKUMOBegcki4H4WkHcyqkLHk7TY8DPD9wKBgQDV0LwXhIHbBzzSJz3MG2HSDHqMsm4FelhaZVW6gYat0XZkIqtXQ3KsPyUJEtJym3pjWT9/7uXT5EUlW5FeKqNmaa3+qFfZUAMLPE2zC7Z0beLtLcbw6RyOv9m5A+GuRFZxKNgna0+jsUGVuaLj7K8NMAjLIeRb9rQy1pnGJBRkSQKBgFyr6OY1+jYKjYxhsjGNKXcaYnfmpPccIFVA8tnNhSgHDNZUwgGHlD9s/i7NJZHav7RC66jLuAokGbY/lp41xEeMmxrZDWLPDL5TZt8OAhRKDnoGdNUw+tAN0Vtzg/etw2KVijTtFGhiWxb3Lwv1FXCDViFpZLmADiu9e6aJsj9dAoGBAK2IuG617pbbFq6vl9lYyYxT5wBYWQ47uHu8vKTfKnZ6zkGecZssiLdSKMwmAB0oJOXPc9QcWe3MYAnFEBw2DygmluxDlE5hK36Nb2Tvs75MD7Bj0noQ4pCC12v1KF57zzhaU9PqkAM8VouLLWe7eOa6ScBZn+3P9Q0EijuPesn/
+ FORMAT: JSON
+ CHARSET: UTF-8
+ SIGN_TYPE: RSA2
+ ALIPAY_PUBLIC_KEY: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApnqCjevyilI4LcWsrUI7d6zSSc/+xqKO6U0Bmf3yCKRNPNubqHeOQ7Wd9+63lswObGNa6sHYkoZEmoO3WhIRu1ruV1gG3dqnuZ93PNHtoG22S6fPoSwJyB1i1N61dPHV7ikU5Ljq/VJhP05cYH+MiZOb5sx47Ub4KqKghVkyZu6mSlVWu/ojipd0H3kl88QXnF1W3QT1B9DSkODg94u4A28SrJHT+8nkPhOsD8cs5NmwmZJUieFiHh69hEgR+Af2xl1G+LNRWN4vTZ4sWcAnQp+
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustAddrDao.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustAddrDao.xml
new file mode 100644
index 0000000..1b0b5d2
--- /dev/null
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustAddrDao.xml
@@ -0,0 +1,264 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into cust_addr(cust_id, addr_id, cust_name, mobile, area_code, detail_addr, addr_full_name, openid, source_type, if_default, if_del, revision, crby, crtime, upby, uptime, place_id)
+ values (#{custId}, #{addrId}, #{custName}, #{mobile}, #{areaCode}, #{detailAddr}, #{addrFullName}, #{openid}, #{sourceType}, #{ifDefault}, #{ifDel}, #{revision}, #{crby}, #{crtime}, #{upby}, #{uptime}, #{placeId})
+
+
+
+ insert into cust_addr(cust_id, addr_id, cust_name, mobile, area_code, detail_addr, addr_full_name, openid, source_type, if_default, if_del, revision, crby, crtime, upby, uptime, place_id)
+ values
+
+ (#{entity.custId}, #{entity.addrId}, #{entity.custName}, #{entity.mobile}, #{entity.areaCode}, #{entity.detailAddr}, #{entity.addrFullName}, #{entity.openid}, #{entity.sourceType}, #{entity.ifDefault}, #{entity.ifDel}, #{entity.revision}, #{entity.crby}, #{entity.crtime}, #{entity.upby}, #{entity.uptime}, #{entity.placeId})
+
+
+
+
+ insert into cust_addr(cust_id, addr_id, cust_name, mobile, area_code, detail_addr, addr_full_name, openid, source_type, if_default, if_del, revision, crby, crtime, upby, uptime, place_id)
+ values
+
+ (#{entity.custId}, #{entity.addrId}, #{entity.custName}, #{entity.mobile}, #{entity.areaCode}, #{entity.detailAddr}, #{entity.addrFullName}, #{entity.openid}, #{entity.sourceType}, #{entity.ifDefault}, #{entity.ifDel}, #{entity.revision}, #{entity.crby}, #{entity.crtime}, #{entity.upby}, #{entity.uptime}, #{entity.placeId})
+
+ on duplicate key update
+ cust_id = values(cust_id),
+ addr_id = values(addr_id),
+ cust_name = values(cust_name),
+ mobile = values(mobile),
+ area_code = values(area_code),
+ detail_addr = values(detail_addr),
+ addr_full_name = values(addr_full_name),
+ openid = values(openid),
+ source_type = values(source_type),
+ if_default = values(if_default),
+ if_del = values(if_del),
+ revision = values(revision),
+ crby = values(crby),
+ crtime = values(crtime),
+ upby = values(upby),
+ uptime = values(uptime),
+ place_id = values(place_id)
+
+
+
+
+ update cust_addr
+
+
+ cust_id = #{custId},
+
+
+ addr_id = #{addrId},
+
+
+ cust_name = #{custName},
+
+
+ mobile = #{mobile},
+
+
+ area_code = #{areaCode},
+
+
+ detail_addr = #{detailAddr},
+
+
+ addr_full_name = #{addrFullName},
+
+
+ openid = #{openid},
+
+
+ source_type = #{sourceType},
+
+
+ if_default = #{ifDefault},
+
+
+ if_del = #{ifDel},
+
+
+ revision = #{revision},
+
+
+ crby = #{crby},
+
+
+ crtime = #{crtime},
+
+
+ upby = #{upby},
+
+
+ uptime = #{uptime},
+
+
+ place_id = #{placeId},
+
+
+ where id = #{id}
+
+
+
+
+ delete from cust_addr where id = #{id}
+
+
+
+
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustPlaceMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustPlaceMapper.xml
new file mode 100644
index 0000000..faa1877
--- /dev/null
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/CustPlaceMapper.xml
@@ -0,0 +1,330 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into cust_place(place_id, place_num, place_name, place_level, if_last, super_id, place_full_name, place_url, canteen_id, shopstall_id, special_recipe_id, common_recipe_id, remarks, if_del, revision, crby, crtime, upby, uptime, user_id, super_ids, public_code, sort)
+ values (#{placeId}, #{placeNum}, #{placeName}, #{placeLevel}, #{ifLast}, #{superId}, #{placeFullName}, #{placeUrl}, #{canteenId}, #{shopstallId}, #{specialRecipeId}, #{commonRecipeId}, #{remarks}, #{ifDel}, #{revision}, #{crby}, #{crtime}, #{upby}, #{uptime}, #{userId}, #{superIds}, #{publicCode}, #{sort})
+
+
+
+ insert into cust_place(place_id, place_num, place_name, place_level, if_last, super_id, place_full_name, place_url, canteen_id, shopstall_id, special_recipe_id, common_recipe_id, remarks, if_del, revision, crby, crtime, upby, uptime, user_id, super_ids, public_code, sort)
+ values
+
+ (#{entity.placeId}, #{entity.placeNum}, #{entity.placeName}, #{entity.placeLevel}, #{entity.ifLast}, #{entity.superId}, #{entity.placeFullName}, #{entity.placeUrl}, #{entity.canteenId}, #{entity.shopstallId}, #{entity.specialRecipeId}, #{entity.commonRecipeId}, #{entity.remarks}, #{entity.ifDel}, #{entity.revision}, #{entity.crby}, #{entity.crtime}, #{entity.upby}, #{entity.uptime}, #{entity.userId}, #{entity.superIds}, #{entity.publicCode}, #{entity.sort})
+
+
+
+
+ insert into cust_place(place_id, place_num, place_name, place_level, if_last, super_id, place_full_name, place_url, canteen_id, shopstall_id, special_recipe_id, common_recipe_id, remarks, if_del, revision, crby, crtime, upby, uptime, user_id, super_ids, public_code, sort)
+ values
+
+ (#{entity.placeId}, #{entity.placeNum}, #{entity.placeName}, #{entity.placeLevel}, #{entity.ifLast}, #{entity.superId}, #{entity.placeFullName}, #{entity.placeUrl}, #{entity.canteenId}, #{entity.shopstallId}, #{entity.specialRecipeId}, #{entity.commonRecipeId}, #{entity.remarks}, #{entity.ifDel}, #{entity.revision}, #{entity.crby}, #{entity.crtime}, #{entity.upby}, #{entity.uptime}, #{entity.userId}, #{entity.superIds}, #{entity.publicCode}, #{entity.sort})
+
+ on duplicate key update
+ place_id = values(place_id),
+ place_num = values(place_num),
+ place_name = values(place_name),
+ place_level = values(place_level),
+ if_last = values(if_last),
+ super_id = values(super_id),
+ place_full_name = values(place_full_name),
+ place_url = values(place_url),
+ canteen_id = values(canteen_id),
+ shopstall_id = values(shopstall_id),
+ special_recipe_id = values(special_recipe_id),
+ common_recipe_id = values(common_recipe_id),
+ remarks = values(remarks),
+ if_del = values(if_del),
+ revision = values(revision),
+ crby = values(crby),
+ crtime = values(crtime),
+ upby = values(upby),
+ uptime = values(uptime),
+ user_id = values(user_id),
+ super_ids = values(super_ids),
+ public_code = values(public_code),
+ sort = values(sort)
+
+
+
+
+ update cust_place
+
+
+ place_id = #{placeId},
+
+
+ place_num = #{placeNum},
+
+
+ place_name = #{placeName},
+
+
+ place_level = #{placeLevel},
+
+
+ if_last = #{ifLast},
+
+
+ super_id = #{superId},
+
+
+ place_full_name = #{placeFullName},
+
+
+ place_url = #{placeUrl},
+
+
+ canteen_id = #{canteenId},
+
+
+ shopstall_id = #{shopstallId},
+
+
+ special_recipe_id = #{specialRecipeId},
+
+
+ common_recipe_id = #{commonRecipeId},
+
+
+ remarks = #{remarks},
+
+
+ if_del = #{ifDel},
+
+
+ revision = #{revision},
+
+
+ crby = #{crby},
+
+
+ crtime = #{crtime},
+
+
+ upby = #{upby},
+
+
+ uptime = #{uptime},
+
+
+ user_id = #{userId},
+
+
+ super_ids = #{superIds},
+
+
+ public_code = #{publicCode},
+
+
+ sort = #{sort},
+
+
+ where id = #{id}
+
+
+
+
+ delete from cust_place where id = #{id}
+
+
+
+
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/SysNoticeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/SysNoticeMapper.xml
new file mode 100644
index 0000000..42e522d
--- /dev/null
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/SysNoticeMapper.xml
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark
+ from sys_notice
+
+
+
+
+
+
+
+ insert into sys_notice (
+ notice_title,
+ notice_type,
+ notice_content,
+ status,
+ remark,
+ create_by,
+ create_time
+ )values(
+ #{noticeTitle},
+ #{noticeType},
+ #{noticeContent},
+ #{status},
+ #{remark},
+ #{createBy},
+ sysdate()
+ )
+
+
+
+ update sys_notice
+
+ notice_title = #{noticeTitle},
+ notice_type = #{noticeType},
+ notice_content = #{noticeContent},
+ status = #{status},
+ update_by = #{updateBy},
+ update_time = sysdate()
+
+ where notice_id = #{noticeId}
+
+
+
+ delete from sys_notice where notice_id = #{noticeId}
+
+
+
+ delete from sys_notice where notice_id in
+
+ #{noticeId}
+
+
+
+
diff --git a/bonus-modules/pom.xml b/bonus-modules/pom.xml
index 33b55ab..c26d8ca 100644
--- a/bonus-modules/pom.xml
+++ b/bonus-modules/pom.xml
@@ -9,8 +9,8 @@
4.0.0
- core-aggregator
- bonus-cateen
+
+
bonus-smart-canteen