diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java b/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java index bf72c7655..c96195185 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxPayOrder.java @@ -56,8 +56,8 @@ public class WxPayOrder implements Serializable { /*用户ID**/ @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") private Long cUserId; - /*支付IP**/ - @io.swagger.annotations.ApiModelProperty(value="支付IP",name="ip") + /*ip地址**/ + @io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip") private String ip; /*支付金额(分)**/ @io.swagger.annotations.ApiModelProperty(value="支付金额(分)",name="payAmount") @@ -68,8 +68,11 @@ public class WxPayOrder implements Serializable { /*支付结束时间(秒)**/ @io.swagger.annotations.ApiModelProperty(value="支付结束时间(秒)",name="payTimeEnd") private Integer payTimeEnd; - /*支付渠道: 0-微信小程序 1--支付宝 2--银联 **/ - @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信小程序 1--支付宝 2--银联 ",name="payVendor") + /*微信生成的订单号**/ + @io.swagger.annotations.ApiModelProperty(value="微信生成的订单号",name="transactionId") + private String transactionId; + /*支付渠道: 0-微信 1-支付宝 2-银联 **/ + @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信 1-支付宝 2-银联 ",name="payVendor") private Integer payVendor; /*支付订单号**/ @io.swagger.annotations.ApiModelProperty(value="支付订单号",name="payOrderNo") @@ -110,15 +113,12 @@ public class WxPayOrder implements Serializable { public void setCUserId(Long _cUserId) { cUserId = _cUserId; } - - public String getIp() { + public String getIp() { return ip; } - public void setIp(String _ip) { - this.ip = _ip; + ip = _ip; } - public Integer getPayAmount() { return payAmount; } @@ -137,6 +137,12 @@ public class WxPayOrder implements Serializable { public void setPayTimeEnd(Integer _payTimeEnd) { payTimeEnd = _payTimeEnd; } + public String getTransactionId() { + return transactionId; + } + public void setTransactionId(String _transactionId) { + transactionId = _transactionId; + } public Integer getPayVendor() { return payVendor; } @@ -172,10 +178,11 @@ public class WxPayOrder implements Serializable { ,UpdateTime_ASC("`updateTime` ASC"),UpdateTime_DESC("`updateTime` DESC") ,OrderId_ASC("`orderId` ASC"),OrderId_DESC("`orderId` DESC") ,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC") - ,IP_ASC("`ip` ASC"),IP_DESC("`ip` DESC") + ,Ip_ASC("`ip` ASC"),Ip_DESC("`ip` DESC") ,PayAmount_ASC("`payAmount` ASC"),PayAmount_DESC("`payAmount` DESC") ,PayTimeStart_ASC("`payTimeStart` ASC"),PayTimeStart_DESC("`payTimeStart` DESC") ,PayTimeEnd_ASC("`payTimeEnd` ASC"),PayTimeEnd_DESC("`payTimeEnd` DESC") + ,TransactionId_ASC("`transactionId` ASC"),TransactionId_DESC("`transactionId` DESC") ,PayVendor_ASC("`payVendor` ASC"),PayVendor_DESC("`payVendor` DESC") ,PayOrderNo_ASC("`payOrderNo` ASC"),PayOrderNo_DESC("`payOrderNo` DESC") ,PayOrderStatus_ASC("`payOrderStatus` ASC"),PayOrderStatus_DESC("`payOrderStatus` DESC") diff --git a/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java b/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java index 21ba7ce49..a012a791e 100644 --- a/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java @@ -16,7 +16,7 @@ public interface WxPayOrderService { */ ResultData createPayOrder(WxPayOrder record, EnumPayWay payWay); - void handleOrderPaySuccess(WxPayOrder record, String tradeNo); + void handleOrderPaySuccess(WxPayOrder record, String transactionId); /** * 异步通知 diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java index 94209e9ca..3e7198deb 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java @@ -166,7 +166,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) - public void handleOrderPaySuccess(WxPayOrder record, String tradeNo) { + public void handleOrderPaySuccess(WxPayOrder record, String transactionId) { EnumPayStatus payStatus = EnumPayStatus.getEnum(record.getPayOrderStatus()); // 判断支付状态 if (payStatus != EnumPayStatus.PAY_WAY_WAIT) { @@ -190,7 +190,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { updatePayOrder.setOrderId(record.getOrderId()); updatePayOrder.setUpdateTime(currentDate); updatePayOrder.setPayOrderStatus(EnumPayStatus.PAY_WAY_SUCCESS.getCode()); - //updatePayOrder.setTradeNo(tradeNo); + updatePayOrder.setTransactionId(transactionId); wxPayOrderMapper.updateByPrimaryKeySelective(updatePayOrder); Map msgMap = new HashMap<>(); @@ -199,6 +199,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { msgMap.put("orderNo", String.valueOf(order.getId())); msgMap.put("createTime", Utility.getDataFormatString3(order.getCreateDate())); msgMap.put("standingTime", order.getCreateDate() + "-" + currentDate ); + // 短信 通知 商户 //smsSenderHandler.sendSms("SMS_18195394", order.getMobile(), msgMap); } catch (Exception e) { logger.error("pay success handle, sms send exception, payOrderi: " + updatePayOrder+ ", msgMap: " + msgMap.toString() + ", e: " + e.getMessage()); diff --git a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml index 6901803d5..60de75590 100644 --- a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml @@ -12,6 +12,7 @@ + @@ -19,7 +20,7 @@ - `id`,`tenant_id`,`create_time`,`update_time`,`order_id`,`c_user_id`,`pay_amount`,`pay_time_start`,`pay_time_end`,`pay_vendor`,`pay_order_no`,`pay_order_status`,`fail_reason` + `id`,`tenant_id`,`create_time`,`update_time`,`order_id`,`c_user_id`,`ip`,`pay_amount`,`pay_time_start`,`pay_time_end`,`transaction_id`,`pay_vendor`,`pay_order_no`,`pay_order_status`,`fail_reason` @@ -53,12 +54,12 @@ and `c_user_id` = #{cUserId} - - - - and `ip` = #{ip} - - + + + + and `ip` like concat('%', #{ip},'%') + + and `pay_amount` = #{payAmount} @@ -75,6 +76,11 @@ + + and `transaction_id` like concat('%', #{transactionId},'%') + + + and `pay_vendor` = #{payVendor}