支付回调

获取数据列表接口问题
token有效期 及 续期
订单详情 为null的情况
根据桌码获取shopid接口调整
首页 默认值

src/main/resources/application-dev.yml

@@ -58,8 +58,11 @@ ysk:
   callBackGroupurl: https://wxcashiertest.sxczgkj.cn/cashierService/notify/notifyCallBackGroup
   callBackIn: https://p40312246f.goho.co/cashierService/notify/memberInCallBack
   default: 18710449883
+thirdPay:
+  callInBack: https://wxcashiertest.sxczgkj.cn/cashierService/notify/fstmemberInCallBack
+  callFSTBack: https://wxcashiertest.sxczgkj.cn/cashierService/notify/notifyfstCallBack
 server:
-  port: 9889
+  port: 9888
 prod: dev1
 queue: cart_queue_putdev1
 

src/main/resources/application-dev2.yml

@@ -55,6 +55,9 @@ ysk:
   callBackGroupurl: https://wxcashiertest.sxczgkj.cn/cashierService/notify/notifyCallBackGroup
   callBackIn: https://p40312246f.goho.co/cashierService/notify/memberInCallBack
   default: 18710449883
+thirdPay:
+  callInBack: https://wxcashiertest.sxczgkj.cn/cashierService/notify/fstmemberInCallBack
+  callFSTBack: https://wxcashiertest.sxczgkj.cn/cashierService/notify/notifyfstCallBack
 server:
   port: 9889
 prod: devyhq

src/main/resources/application-prod.yml

@@ -57,6 +57,9 @@ ysk:
   callBackGroupurl: https://cashier.sxczgkj.cn/cashierService/notify/notifyCallBackGroup
   callBackIn: https://cashier.sxczgkj.cn/cashierService/notify/memberInCallBack
   default: 19191703856
+thirdPay:
+  callInBack: https://cashier.sxczgkj.cn${server.servlet.context-path}notify/fstmemberInCallBack
+  callFSTBack: https://cashier.sxczgkj.cn${server.servlet.context-path}notify/notifyfstCallBack
 prod: prod1
 queue: cart_queue_putprod1
 

src/main/resources/application-prod2.yml

@@ -57,6 +57,9 @@ ysk:
   callBackGroupurl: https://cashier.sxczgkj.cn/cashierService/notify/notifyCallBackGroup
   callBackIn: https://cashier.sxczgkj.cn/cashierService/notify/memberInCallBack
   default: 19191703856
+thirdPay:
+  callInBack: https://cashier.sxczgkj.cn${server.servlet.context-path}notify/fstmemberInCallBack
+  callFSTBack: https://cashier.sxczgkj.cn${server.servlet.context-path}notify/notifyfstCallBack
 prod: prod2
 queue: cart_queue_putprod2
 

src/main/resources/application.yml

@@ -10,6 +10,8 @@ wx:
     custom:
       appId: wxd88fffa983758a30
       secrete: a34a61adc0602118b49400baa8812454
+#      appId: wxc2bb94c0ddda1032
+#      secrete: 5fe6b30f688ae461561250ed3e3db35b
 #      卓尔
 #      appId: wx0dcea6001b0a8fb4
 #      secrete: ba42423cce61f93f02519ff3030ceb1c
@@ -60,6 +62,4 @@ aliyun:
 
 thirdPay:
   payType: fushangtong
-  callInBack: https://cashier.sxczgkj.cn${server.servlet.context-path}notify/fstmemberInCallBack
-  callFSTBack:  https://cashier.sxczgkj.cn${server.servlet.context-path}notify/notifyfstCallBack
   url: https://paymentapi.sxczgkj.cn

src/main/resources/mapper/TbCashierCartMapper.xml

@@ -310,6 +310,9 @@
             <if test="updatedAt != null">
                 updated_at = #{updatedAt,jdbcType=BIGINT},
             </if>
+            <if test="userId != null">
+                user_id=#{userId,jdbcType=INTEGER},
+            </if>
             <if test="pendingAt != null">
                 pending_at = #{pendingAt,jdbcType=BIGINT},
             </if>
@@ -322,30 +325,7 @@
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
-    <update id="updateByPrimaryKey" parameterType="com.chaozhanggui.system.cashierservice.entity.TbCashierCart">
-    update tb_cashier_cart
-    set master_id = #{masterId,jdbcType=VARCHAR},
-      order_id = #{orderId,jdbcType=VARCHAR},
-      ref_order_id = #{refOrderId,jdbcType=VARCHAR},
-      total_amount = #{totalAmount,jdbcType=DECIMAL},
-      product_id = #{productId,jdbcType=VARCHAR},
-      cover_img = #{coverImg,jdbcType=VARCHAR},
-      is_sku = #{isSku,jdbcType=TINYINT},
-      sku_id = #{skuId,jdbcType=VARCHAR},
-      name = #{name,jdbcType=VARCHAR},
-      sale_price = #{salePrice,jdbcType=DECIMAL},
-      number = #{number,jdbcType=REAL},
-      total_number = #{totalNumber,jdbcType=REAL},
-      refund_number = #{refundNumber,jdbcType=REAL},
-      category_id = #{categoryId,jdbcType=VARCHAR},
-      status = #{status,jdbcType=VARCHAR},
-      type = #{type,jdbcType=TINYINT},
-      merchant_id = #{merchantId,jdbcType=VARCHAR},
-      shop_id = #{shopId,jdbcType=VARCHAR},
-      created_at = #{createdAt,jdbcType=BIGINT},
-      updated_at = #{updatedAt,jdbcType=BIGINT}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+
     <update id="updateStatus">
     update tb_cashier_cart set status = #{status} where id = #{id}
   </update>

src/main/resources/mapper/TbProductMapper.xml

@@ -924,6 +924,7 @@
       AND t.product_id = #{productId}
       AND t.`status` = 'create'
       AND t.table_id = #{code}
+      AND user_id IN
     <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
       #{item}
     </foreach>