Merge remote-tracking branch 'origin/dev_member_voucher_refund_09151' into...

Merge remote-tracking branch 'origin/dev_member_voucher_refund_09151' into dev_member_voucher_refund_09151

liquidnet-bus-config/liquidnet-config/liquidnet-service-platform.yml

@@ -141,6 +141,7 @@ global-auth:
     - ${liquidnet.info.context}/performancesExpress/orderStatus
     - ${liquidnet.info.context}/performancesExpress/orderRoute
     - ${liquidnet.info.context}/performancesExpress/orderFreightList
+    - ${liquidnet.info.context}/amorder/callack/refund
 
 # -----------------------------------------------------------
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql

@@ -392,7 +392,7 @@ create table adam_member_refund
 
     comment       varchar(255)
 ) engine = InnoDB comment '会员退款';
-create unique index uidx_adam_member_refund_id on adam_member_refund (order_no);
+create unique index uidx_adam_member_refund_id on adam_member_refund (refund_no);
 
 
 # 添加权益管理（关联会员券）

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/PlatformMemberRefundService.java

@@ -36,27 +36,27 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
     public boolean refundProcessing(HttpServletRequest request) {
         String refundNo = request.getParameter("orderRefundCode");
         String refundAt = request.getParameter("refundAt");
-        String orderNo = request.getParameter("refundCode");
+        String payNo = request.getParameter("refundCode");
         String refundError = request.getParameter("refundError");
         String refundAmt = request.getParameter("refundPrice");
         int status = Integer.parseInt(request.getParameter("status"));
 
         AdamMemberRefund memberRefund = this.getOne(Wrappers.lambdaQuery(AdamMemberRefund.class)
-                .eq(AdamMemberRefund::getRefundNo, refundNo).eq(AdamMemberRefund::getOrderNo, orderNo));
+                .eq(AdamMemberRefund::getRefundNo, refundNo));
 
         if (null == memberRefund) {
-            log.warn("会员退款回调处理失败:订单不存在[orderNo:{},refundNo:{}]", orderNo, refundNo);
+            log.warn("会员退款回调处理失败:订单不存在[payNo:{},refundNo:{}]", payNo, refundNo);
             return false;
         }
         if (memberRefund.getRefundState() != 9) {
-            log.warn("会员退款回调处理失败:订单已处理[orderNo:{},refundNo:{}]", orderNo, refundNo);
+            log.warn("会员退款回调处理失败:订单已处理[payNo:{},refundNo:{}]", payNo, refundNo);
             return true;
         }
 
         LocalDateTime now = LocalDateTime.now();
 
         LambdaUpdateWrapper<AdamMemberRefund> memberRefundLambdaUpdateWrapper = Wrappers.lambdaUpdate(AdamMemberRefund.class)
-                .eq(AdamMemberRefund::getRefundNo, refundNo).eq(AdamMemberRefund::getOrderNo, orderNo);
+                .eq(AdamMemberRefund::getRefundNo, refundNo);
         memberRefundLambdaUpdateWrapper.set(AdamMemberRefund::getRefundAt, refundAt);
         memberRefundLambdaUpdateWrapper.set(AdamMemberRefund::getRefundReason, refundError);
         memberRefundLambdaUpdateWrapper.set(AdamMemberRefund::getUpdatedAt, now);
@@ -69,14 +69,14 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
                 memberRefundLambdaUpdateWrapper.set(AdamMemberRefund::getRefundState, 1);
                 if (this.update(memberRefundLambdaUpdateWrapper)) {
 
-                    this.refundSuccProcessing(orderNo, now);
+                    this.refundSuccProcessing(memberRefund.getOrderNo(), now);
 
                     return true;
                 } else {
                     return false;
                 }
             default:
-                log.warn("会员退款回调处理失败:未知的状态[orderNo:{},refundNo:{},status:{}]", orderNo, refundNo, status);
+                log.warn("会员退款回调处理失败:未知的状态[orderNo:{},refundNo:{},status:{}]", memberRefund.getOrderNo(), refundNo, status);
                 return false;
         }
     }