维沙支付修改最终版

src/main/java/com/caimei/controller/PayOrderApi.java

@@ -16,7 +16,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.reactive.function.server.ServerRequest;
 
 import java.util.Map;
 
@@ -113,9 +112,8 @@ public class PayOrderApi {
      * 支付异步通知回调
      */
     @GetMapping("/paymentCallback")
-    public String paymentCallback(ServerRequest request) throws Exception {
+    public String paymentCallback(String data) throws Exception {
         log.info("异步回调通知>>>>>>>start");
-        String data = request.pathVariable("data");
         if (StringUtils.isBlank(data)) {
             return "回调参数失败";
         }
@@ -200,9 +198,8 @@ public class PayOrderApi {
      * 延时分账异步通知回调
      */
     @GetMapping("/delayedSplittingCallback")
-    public String delayedSplittingCallback(ServerRequest request) {
+    public String delayedSplittingCallback(String data) {
         log.info("延时分账异步通知>>>>>>>start");
-        String data = request.pathVariable("data");
         if (StringUtils.isBlank(data)) {
             return "回调参数失败";
         }

src/main/resources/mapper/OrderMapper.xml

@@ -33,6 +33,7 @@
           clauseName,
           freePostFlag,
           freight,
+          paySuccessCounter,
           closeReason
     </sql>
     <select id="findOrderList" resultType="com.caimei.model.vo.OrderVo">

src/main/resources/mapper/PayOrderMapper.xml

@@ -29,44 +29,20 @@
     <update id="updateSelective">
         update cm_order
         <set>
-            <if test="orderNo != null">
-                orderNo = #{orderNo,jdbcType=VARCHAR},
-            </if>
-            <if test="userID != null">
-                userID = #{userID,jdbcType=BIGINT},
-            </if>
-            <if test="buyUserID != null">
-                buyUserID = #{buyUserID,jdbcType=INTEGER},
-            </if>
-            <if test="shopOrderIDs != null">
-                shopOrderIDs = #{shopOrderIDs,jdbcType=VARCHAR},
-            </if>
-            <if test="orderSubmitType != null">
-                orderSubmitType = #{orderSubmitType,jdbcType=INTEGER},
-            </if>
-            <if test="orderType != null">
-                orderType = #{orderType,jdbcType=INTEGER},
-            </if>
-            <if test="hasActProduct != null">
-                hasActProduct = #{hasActProduct,jdbcType=CHAR},
-            </if>
-            <if test="autoCloseTimeMills != null">
-                autoCloseTimeMills = #{autoCloseTimeMills,jdbcType=DECIMAL},
-            </if>
             <if test="status != null">
-                `status` = #{status,jdbcType=CHAR},
+                `status` = #{status},
             </if>
             <if test="receiptStatus != null">
-                receiptStatus = #{receiptStatus,jdbcType=CHAR},
+                receiptStatus = #{receiptStatus},
             </if>
             <if test="payStatus != null">
-                payStatus = #{payStatus,jdbcType=CHAR},
+                payStatus = #{payStatus},
             </if>
             <if test="sendOutStatus != null">
-                sendOutStatus = #{sendOutStatus,jdbcType=CHAR},
+                sendOutStatus = #{sendOutStatus},
             </if>
             <if test="refundType != null">
-                refundType = #{refundType,jdbcType=CHAR},
+                refundType = #{refundType},
             </if>
             <if test="paySuccessCounter != null">
                 paySuccessCounter = #{paySuccessCounter},
@@ -75,118 +51,10 @@
                 payFlag = #{payFlag,jdbcType=CHAR},
             </if>
             <if test="onlinePayFlag != null">
-                onlinePayFlag = #{onlinePayFlag,jdbcType=CHAR},
-            </if>
-            <if test="productTotalFee != null">
-                productTotalFee = #{productTotalFee,jdbcType=DECIMAL},
-            </if>
-            <if test="orderTotalFee != null">
-                orderTotalFee = #{orderTotalFee,jdbcType=DECIMAL},
-            </if>
-            <if test="payTotalFee != null">
-                payTotalFee = #{payTotalFee,jdbcType=DECIMAL},
-            </if>
-            <if test="payableAmount != null">
-                payableAmount = #{payableAmount,jdbcType=DECIMAL},
-            </if>
-            <if test="balancePayFee != null">
-                balancePayFee = #{balancePayFee,jdbcType=DECIMAL},
-            </if>
-            <if test="preferential != null">
-                preferential = #{preferential,jdbcType=DECIMAL},
-            </if>
-            <if test="discountFee != null">
-                discountFee = #{discountFee,jdbcType=DECIMAL},
-            </if>
-            <if test="spID != null">
-                spID = #{spID,jdbcType=BIGINT},
-            </if>
-            <if test="mainSpID != null">
-                mainSpID = #{mainSpID,jdbcType=BIGINT},
-            </if>
-            <if test="note != null">
-                note = #{note,jdbcType=VARCHAR},
-            </if>
-            <if test="clubID != null">
-                clubID = #{clubID,jdbcType=BIGINT},
-            </if>
-            <if test="clubScanTime != null">
-                clubScanTime = #{clubScanTime,jdbcType=VARCHAR},
-            </if>
-            <if test="payWay != null">
-                payWay = #{payWay,jdbcType=VARCHAR},
-            </if>
-            <if test="orderSource != null">
-                orderSource = #{orderSource,jdbcType=CHAR},
-            </if>
-            <if test="closeTime != null">
-                closeTime = #{closeTime,jdbcType=VARCHAR},
-            </if>
-            <if test="confirmTime != null">
-                confirmTime = #{confirmTime,jdbcType=VARCHAR},
-            </if>
-            <if test="payTime != null">
-                payTime = #{payTime,jdbcType=VARCHAR},
-            </if>
-            <if test="orderTime != null">
-                orderTime = #{orderTime,jdbcType=VARCHAR},
-            </if>
-            <if test="productCount != null">
-                productCount = #{productCount,jdbcType=INTEGER},
-            </if>
-            <if test="presentCount != null">
-                presentCount = #{presentCount,jdbcType=INTEGER},
-            </if>
-            <if test="cooFreeFlag != null">
-                cooFreeFlag = #{cooFreeFlag,jdbcType=CHAR},
-            </if>
-            <if test="cooFreeRate != null">
-                cooFreeRate = #{cooFreeRate,jdbcType=INTEGER},
-            </if>
-            <if test="cooFreeAmount != null">
-                cooFreeAmount = #{cooFreeAmount,jdbcType=DECIMAL},
-            </if>
-            <if test="invoiceFlag != null">
-                invoiceFlag = #{invoiceFlag,jdbcType=CHAR},
-            </if>
-            <if test="confirmFlag != null">
-                confirmFlag = #{confirmFlag,jdbcType=CHAR},
-            </if>
-            <if test="clauseID != null">
-                clauseID = #{clauseID,jdbcType=BIGINT},
-            </if>
-            <if test="clauseContent != null">
-                clauseContent = #{clauseContent,jdbcType=VARCHAR},
-            </if>
-            <if test="clauseName != null">
-                clauseName = #{clauseName,jdbcType=VARCHAR},
-            </if>
-            <if test="updateDate != null">
-                updateDate = #{updateDate,jdbcType=VARCHAR},
-            </if>
-            <if test="freePostFlag != null">
-                freePostFlag = #{freePostFlag,jdbcType=CHAR},
-            </if>
-            <if test="freight != null">
-                freight = #{freight,jdbcType=DECIMAL},
-            </if>
-            <if test="delFlag != null">
-                delFlag = #{delFlag,jdbcType=CHAR},
-            </if>
-            <if test="freePostageTicketID != null">
-                freePostageTicketID = #{freePostageTicketID,jdbcType=INTEGER},
-            </if>
-            <if test="splitFlag != null">
-                splitFlag = #{splitFlag,jdbcType=CHAR},
-            </if>
-            <if test="closeReason != null">
-                closeReason = #{closeReason,jdbcType=VARCHAR},
-            </if>
-            <if test="postageOrderFlag != null">
-                postageOrderFlag = #{postageOrderFlag,jdbcType=CHAR},
+                onlinePayFlag = #{onlinePayFlag},
             </if>
         </set>
-        where orderID = #{orderID,jdbcType=BIGINT}
+        where orderID = #{orderId}
     </update>
 
     <insert id="insertDiscernReceipt" keyColumn="id" keyProperty="id" useGeneratedKeys="true" parameterType="com.caimei.model.po.CmDiscernReceiptPo">