mirror of
https://gitee.com/lab1024/smart-admin.git
synced 2025-10-02 02:06:38 +08:00
搞定了，后台更新了以下几点：
1：getCartProductInfo 新增了“leftAllotment”字段 2：insertCartProductInfo 新增了“leftAllotment”字段 3：generateOrderWX 入参新增了“basePoint” 4：updateOrderWX微信回调方法，新增了自动增加该账户积分信息。
This commit is contained in:
Carl
parent
df498f597a
commit
4a54185c01
@ -48,6 +48,7 @@ public class OrderController {
|
||||
@Autowired
|
||||
private CartService cartService;
|
||||
|
||||
|
||||
@ApiOperation(value = "微信支付订单", notes = "生成订单")
|
||||
@PostMapping("royalcanin/generateOrderWX")
|
||||
public ResponseDTO<String> generateOrderWX(@RequestBody List<OrdersEntity> ordersEntityList) throws Exception {
|
||||
@ -57,6 +58,7 @@ public class OrderController {
|
||||
String mobile = "";
|
||||
int buyCount = 0;
|
||||
double total_fee = 0 ;
|
||||
double basePoint = 0 ;
|
||||
WxPayEntity wxPayEntity = new WxPayEntity();
|
||||
JSONArray orderDatilListJson = new JSONArray();
|
||||
OrdersEntity ordersEntity = new OrdersEntity();
|
||||
@ -79,6 +81,7 @@ public class OrderController {
|
||||
}else{
|
||||
total_fee = total_fee + Double.parseDouble(ordersEntitys.getPayAmount()) * ordersEntitys.getBuyCount() ;
|
||||
}
|
||||
basePoint = basePoint + ordersEntitys.getBasePoint();
|
||||
orderAddress.setAddressCityName(ordersEntitys.getOrderAddress().getAddressCityName());
|
||||
orderAddress.setAddressCountyName(ordersEntitys.getOrderAddress().getAddressCountyName());
|
||||
orderAddress.setAddressDetailInfo(ordersEntitys.getOrderAddress().getAddressDetailInfo());
|
||||
@ -100,6 +103,7 @@ public class OrderController {
|
||||
ordersEntity.setBuyCount(buyCount);
|
||||
ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo());
|
||||
ordersEntity.setOrderStatus("0");
|
||||
ordersEntity.setBasePoint(basePoint);
|
||||
|
||||
if(orderService.generateOrder(ordersEntity,orderDatilListJson) == 1){
|
||||
wxPayEntity.setProduct_id(ordersEntity.getProductCode());
|
||||
|
||||
@ -25,4 +25,6 @@ public class CartEntity {
|
||||
|
||||
private String mobile;
|
||||
|
||||
private int leftAllotment;
|
||||
|
||||
}
|
||||
|
||||
@ -41,5 +41,5 @@ public class OrderEntity {
|
||||
|
||||
private String payType="1";
|
||||
|
||||
|
||||
private String basePoint;
|
||||
}
|
||||
|
||||
@ -41,4 +41,6 @@ public class OrdersEntity {
|
||||
|
||||
private OrderAddress orderAddress;
|
||||
|
||||
private Double basePoint;
|
||||
|
||||
}
|
||||
|
||||
@ -21,17 +21,17 @@ public class MemberAccountChangeEntity {
|
||||
/**
|
||||
* 会员ID
|
||||
*/
|
||||
private int memberId;
|
||||
private String memberId;
|
||||
|
||||
/**
|
||||
* 积分变更类型
|
||||
*/
|
||||
private int changeTypeId;
|
||||
private String changeTypeId;
|
||||
|
||||
/**
|
||||
* 积分增加/减少数量
|
||||
*/
|
||||
private BigDecimal changeValue;
|
||||
private String changeValue;
|
||||
|
||||
/**
|
||||
* 积分明细
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
package net.lab1024.smartadmin.module.system.wxpay;
|
||||
|
||||
import net.lab1024.smartadmin.module.system.royalcanin.domain.RoyalcaninOperateLogService;
|
||||
import net.lab1024.smartadmin.module.system.royalcanin.MemberAccountService;
|
||||
import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderEntity;
|
||||
import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService;
|
||||
import net.lab1024.smartadmin.module.system.royalcanin.memberAccount.MemberAccountChangeEntity;
|
||||
import net.lab1024.smartadmin.module.system.royalcanin.notify.model.NotifyEntity;
|
||||
import net.lab1024.smartadmin.module.system.royalcanin.notify.service.NotifyService;
|
||||
import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.AddOrSaveEntity;
|
||||
import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.QueryEntity;
|
||||
import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPay;
|
||||
import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayUtil;
|
||||
@ -40,6 +41,12 @@ public class WxpayService {
|
||||
private NotifyService notifyService;
|
||||
|
||||
|
||||
@Autowired
|
||||
private MemberAccountService memberAccountService;
|
||||
|
||||
|
||||
|
||||
|
||||
public String generateQRCode(WxPayEntity wxPayEntity) throws Exception {
|
||||
WXPay wxpay = new WXPay(config);
|
||||
InetAddress ip4 = Inet4Address.getLocalHost();
|
||||
@ -86,6 +93,13 @@ public class WxpayService {
|
||||
if ("SUCCESS".equals(sortedMap.get("result_code"))) {
|
||||
String outTradeNo = sortedMap.get("out_trade_no"); // 流水号
|
||||
String totalFee = sortedMap.get("total_fee"); // 交易金额
|
||||
OrderEntity orderEntity = orderService.findByOrderId(outTradeNo);
|
||||
MemberAccountChangeEntity memberAccountChangeEntity = new MemberAccountChangeEntity();
|
||||
memberAccountChangeEntity.setChangeTypeId("1");
|
||||
memberAccountChangeEntity.setChangeValue(orderEntity.getBasePoint());
|
||||
memberAccountChangeEntity.setMemberId(orderEntity.getMemberId());
|
||||
memberAccountService.memberAccountChange(memberAccountChangeEntity);
|
||||
|
||||
|
||||
NotifyEntity notifyEntity = new NotifyEntity();
|
||||
notifyEntity.setAppId(sortedMap.get("appid"));
|
||||
|
||||
@ -78,7 +78,8 @@ public class SmartJWTUtil {
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
String token = SmartJWTUtil.generateToken("844350");
|
||||
String token = SmartJWTUtil.generateToken("884234");
|
||||
System.out.println(token);
|
||||
System.out.println(SmartJWTUtil.decodeToken(token));
|
||||
}
|
||||
|
||||
|
||||
@ -36,7 +36,7 @@ CREATE TABLE IF NOT EXISTS `t_department` (
|
||||
DELETE FROM `t_department`;
|
||||
/*!40000 ALTER TABLE `t_department` DISABLE KEYS */;
|
||||
INSERT INTO `t_department` (`id`, `name`, `short_name`, `manager_id`, `parent_id`, `sort`, `update_time`, `create_time`) VALUES
|
||||
(1, '1024创新实验室', 'ZWGWL', 16, 0, 1, '2019-04-03 10:41:25', '2019-04-03 10:41:25'),
|
||||
(1, '实验室', 'ZWGWL', 16, 0, 1, '2019-04-03 10:41:25', '2019-04-03 10:41:25'),
|
||||
(2, '二级部门-2', NULL, 15, 1, 17, '2019-04-15 16:45:10', '2019-04-15 16:45:10'),
|
||||
(4, '二级部门-1', '管理', 14, 1, 20, '2019-04-17 16:14:55', '2019-04-17 16:14:55'),
|
||||
(8, '三级部门-1', NULL, NULL, 4, 8, '2019-04-25 12:25:52', '2019-04-25 12:25:52'),
|
||||
@ -213,7 +213,7 @@ CREATE TABLE IF NOT EXISTS `t_file` (
|
||||
DELETE FROM `t_file`;
|
||||
/*!40000 ALTER TABLE `t_file` DISABLE KEYS */;
|
||||
INSERT INTO `t_file` (`id`, `module_id`, `module_type`, `file_name`, `file_size`, `file_type`, `file_path`, `file_location_type`, `creater_user`, `update_time`, `create_time`) VALUES
|
||||
(1, '1', '1', '阿里云1.jpg', NULL, NULL, 'backUser/config/d1788b717be24f14ba526f25397b936f', 2, 1, NULL, '2019-07-05 10:38:15'),
|
||||
(1, '1', '1', '阿里.jpg', NULL, NULL, 'backUser/config/d1788b717be24f14ba526f25397b936f', 2, 1, NULL, '2019-07-05 10:38:15'),
|
||||
(2, '2', '1', '1.jpg', NULL, NULL, 'backUser/config/8895ec770c4e4e558c6d9b54eb00dffc', 2, 1, '2019-07-18 09:20:59', '2019-07-18 09:20:25'),
|
||||
(3, '3', '1', '随笔.txt', NULL, NULL, 'backUser/config/f5cbc4c9a56f4fa7ad0ba58b0aa5d169', 2, 1, NULL, '2019-07-18 09:22:47'),
|
||||
(4, '3', '1', '1.jpg', NULL, NULL, 'backUser/config/2019071809245603e0a4e449a4bf3aa28ee731c309040.jpg', 1, 1, NULL, '2019-07-18 09:24:51'),
|
||||
@ -328,7 +328,7 @@ INSERT INTO `t_notice` (`id`, `title`, `content`, `deleted`, `send_status`, `cre
|
||||
(95, '4444444', '444444444444', 1, 1, 1, '2019-07-13 17:54:53', '2019-09-04 09:42:02'),
|
||||
(96, '3434', '444444', 1, 1, 1, '2019-07-13 17:58:42', '2019-11-08 09:05:24'),
|
||||
(97, '44444', '555555555555', 1, 1, 1, '2019-07-13 17:58:54', '2019-09-03 16:19:50'),
|
||||
(98, '《青花瓷》', '素胚勾勒出青花笔锋浓转淡\n瓶身描绘的牡丹一如你初妆\n冉冉檀香透过窗心事我了然\n周杰伦 青花瓷\n周杰伦 青花瓷\n宣纸上走笔至此搁一半\n釉色渲染仕女图韵味被私藏\n而你嫣然的一笑如含苞待放\n你的美一缕飘散\n去到我去不了的地方\n天青色等烟雨 而我在等你\n炊烟袅袅升起 隔江千万里\n在瓶底书刻隶仿前朝的飘逸\n就当我为遇见你伏笔\n天青色等烟雨 而我在等你\n月色被打捞起 晕开了结局\n如传世的青花瓷自顾自美丽\n你眼带笑意\n色白花青的锦鲤跃然于碗底\n临摹宋体落款时却惦记着你\n你隐藏在窑烧里千年的秘密\n极细腻犹如绣花针落地\n篱外芭蕉惹骤雨门环惹铜绿\n而我路过那江南小镇惹了你\n在泼墨山水画里\n你从墨色深处被隐去\n天青色等烟雨 而我在等你\n炊烟袅袅升起 隔江千万里\n在瓶底书刻隶仿前朝的飘逸\n就当我为遇见你伏笔\n天青色等烟雨 而我在等你\n月色被打捞起 晕开了结局\n如传世的青花瓷自顾自美丽\n你眼带笑意\n天青色等烟雨 而我在等你\n炊烟袅袅升起 隔江千万里\n在瓶底书刻隶仿前朝的飘逸\n就当我为遇见你伏笔\n天青色等烟雨 而我在等你\n月色被打捞起 晕开了结局\n如传世的青花瓷自顾自美丽\n你眼带笑意 ', 1, 1, 1, '2019-08-05 16:36:44', '2019-09-02 17:53:12'),
|
||||
(98, '《青花瓷》', '你眼带笑意 ', 1, 1, 1, '2019-08-05 16:36:44', '2019-09-02 17:53:12'),
|
||||
(99, '1', '2', 1, 1, 30, '2019-08-08 14:53:58', '2019-08-08 14:54:07'),
|
||||
(100, '呵呵', '呵呵', 1, 1, 1, '2019-08-20 16:52:53', '2019-09-02 17:46:59'),
|
||||
(101, 'aa', 'bbcc', 1, 1, 30, '2019-08-23 09:51:01', '2019-08-23 09:51:28'),
|
||||
@ -1604,29 +1604,6 @@ CREATE TABLE IF NOT EXISTS `t_royalcanin_operate_log` (
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=51 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||
|
||||
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
|
||||
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
|
||||
|
||||
|
||||
CREATE TABLE `t_good_user` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '用户Id',
|
||||
`username` varchar(128) DEFAULT NULL COMMENT '用户名',
|
||||
`sex` varchar(20) DEFAULT NULL COMMENT '性别',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8 COMMENT='产品用户表';
|
||||
|
||||
CREATE TABLE `t_good_flow` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`flow_no` varchar(32) DEFAULT NULL COMMENT '流水号',
|
||||
`order_no` varchar(20) DEFAULT NULL COMMENT '订单号',
|
||||
`product_id` varchar(20) DEFAULT NULL COMMENT '产品主键ID',
|
||||
`pay_amount` varchar(11) DEFAULT NULL COMMENT '支付金额',
|
||||
`pay_type` int(11) DEFAULT NULL COMMENT '支付方式\r\n 1：支付宝\r\n 2：微信',
|
||||
`buy_count` int(11) DEFAULT NULL COMMENT '购买个数',
|
||||
`create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='产品流水表';
|
||||
|
||||
CREATE TABLE `t_good_orders` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
@ -1643,6 +1620,7 @@ CREATE TABLE `t_good_orders` (
|
||||
`member_id` varchar(20) DEFAULT NULL COMMENT '用户member',
|
||||
`phone_number` varchar(20) DEFAULT NULL COMMENT '用户手机',
|
||||
`buy_count` int(11) DEFAULT NULL COMMENT '产品购买的个数',
|
||||
`base_point` int(11) DEFAULT NULL COMMENT '产品积分',
|
||||
`pay_type` int(11) DEFAULT NULL COMMENT '支付方式 1：支付宝 2：微信',
|
||||
`create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '订单创建时间',
|
||||
`pay_time` datetime DEFAULT NULL COMMENT '支付时间',
|
||||
@ -1677,6 +1655,7 @@ CREATE TABLE IF NOT EXISTS `t_royalcanin_cart` (
|
||||
`product_img` varchar(5000) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
|
||||
`specifications` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
|
||||
`buy_count` int(20) DEFAULT NULL,
|
||||
`left_allotment` int(20) DEFAULT NULL,
|
||||
`member_id` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
|
||||
`mobile` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user