diff --git a/mallinkAdmin/src/main/resources/db/migration/V201908291430__POS_CHANGED.sql b/mallinkAdmin/src/main/resources/db/migration/V201908291430__POS_CHANGED.sql index 0ab0690cc..193d70432 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201908291430__POS_CHANGED.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201908291430__POS_CHANGED.sql @@ -1,2 +1,5 @@ alter table wx_pay_order -change column `pos_pay_id` `pos_pay_order_id` bigint(20) NULL COMMENT 'POS支付订单ID'; \ No newline at end of file +add `pos_payment_type` tinyint(6) NULL COMMENT '支付方式: 0微信;1支付宝;2现金;3会员折扣;4优惠券;5预付卡;6银行卡,来源于POS' after `type`, +modify `ip` varchar(20) NULL COMMENT 'ip地址', +change column `pos_pay_id` `pos_pay_order_id` bigint(20) NULL COMMENT 'POS支付订单ID', +change column `type` `pay_from` tinyint(6) NOT NULL DEFAULT '0' COMMENT '支付类型(0:C端微信支付, 1:POS支付)'; diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index 2a2c07b93..af1e52df8 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -1972,6 +1972,7 @@ public class PosServiceImpl implements PosService { setId(id); setTenantId(merchantBUser.getTenantId()); setCUserId(memId); + setBUserId(merchantBUser.getId()); setOrderId(order.getId()); setCreateTime(curDate); setUpdateTime(curDate); @@ -1982,6 +1983,7 @@ public class PosServiceImpl implements PosService { setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode()); setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); setShare(EnumPayShare.NO.getCode()); + setPayFrom(EnumPayFrom.POS.getCode()); setPosPayOrderId(posPayOrderId); setPosPayOrderTime(neuPosPayOrderTime.getTime()); setPosPaymentType(EnumNeuPosPamentType.MEM_COUPON.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java index 813f40045..0d01c2aee 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java @@ -64,6 +64,8 @@ public class WxPayOrder extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="支付后结果来源(0:callback, 1:query)",name="payEndFrom") private Integer payEndFrom; + @io.swagger.annotations.ApiModelProperty(value="支付后结果来源(0:C端微信支付, 1:POS支付)",name="payFrom") + private Integer payFrom; @io.swagger.annotations.ApiModelProperty(value="支付订单号,来源于POS",name="posPayOrderId") private Long posPayOrderId; @io.swagger.annotations.ApiModelProperty(value="支付订单创建时间,来源于POS",name="posPayOrderTime") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumPayEndFrom.java b/mallinkService/src/main/java/com/iformall/enums/EnumPayEndFrom.java new file mode 100644 index 000000000..4aa58f79e --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumPayEndFrom.java @@ -0,0 +1,35 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumPayEndFrom { + + CALLBACK(0, "callback"), + QUERY(1, "查询"); + + public static EnumPayEndFrom getEnum(Integer code) { + for (EnumPayEndFrom value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumPayEndFrom(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumPayFrom.java b/mallinkService/src/main/java/com/iformall/enums/EnumPayFrom.java index c81002007..8ff2c1b05 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumPayFrom.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumPayFrom.java @@ -5,8 +5,8 @@ package com.iformall.enums; */ public enum EnumPayFrom { - CALLBACK(0, "callback"), - QUERY(1, "查询"); + INSIDE_C(0, "C端支付"), + POS(1, "POS"); public static EnumPayFrom getEnum(Integer code) { for (EnumPayFrom value : values()) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index b6dc241cd..578b45146 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -724,7 +724,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { if ("MICROPAY".equals(tradeType)) { handleMicroOrderPaySuccess(record, transactionId, openId, sub_is_subscribe); } else { - handleOrderPaySuccess(record, transactionId, EnumPayFrom.QUERY.getCode()); + handleOrderPaySuccess(record, transactionId, EnumPayEndFrom.QUERY.getCode()); } return new ResultData(Result.SUCCESS, "订单支付成功", returnMap); } else if ("REFUND".equals(trade_state)) { @@ -1125,10 +1125,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { timeEnd = new Date(); } payOrder.setPayTimeEnd(timeEnd); - payOrder.setPayEndFrom(EnumPayFrom.CALLBACK.getCode()); + payOrder.setPayEndFrom(EnumPayEndFrom.CALLBACK.getCode()); // 处理支付成功 - handleOrderPaySuccess(payOrder, paramMap.get("transaction_id"), EnumPayFrom.CALLBACK.getCode()); + handleOrderPaySuccess(payOrder, paramMap.get("transaction_id"), EnumPayEndFrom.CALLBACK.getCode()); logger.info("notify order, wxpay checksign success, paramMap:{}, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); resultMap.put("return_code", "SUCCESS");