fix

@@ -17,5 +17,5 @@ public interface SellerOrderMetaMapper {
 
     int updateByPrimaryKey(SellerOrderMeta record);
 
-    BuyerOrderMeta selectByMetaKey(@Param("uid") int uid, @Param("orderCode") long orderCode, @Param("metaKey") String metaKey);
+    SellerOrderMeta selectByMetaKey(@Param("uid") int uid, @Param("skup") int skup, @Param("metaKey") String metaKey);
 }
\ No newline at end of file

@@ -58,6 +58,7 @@
   <select id="selectByUidStatusList" resultMap="BaseResultMap">
     select <include refid="Base_Column_List" /> from seller_order_goods
     where <include refid="sql_where_4_select_UidStatusList"/>
+    limit #{offset, jdbcType=INTEGER}, #{limit, jdbcType=INTEGER}
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">

@@ -34,7 +34,7 @@
     <include refid="Base_Column_List" />
     from seller_order_meta
     where uid = #{uid,jdbcType=INTEGER}
-    and order_code = #{orderCode,jdbcType=BIGINT}
+    and skup = #{skup,jdbcType=BIGINT}
     and meta_key = #{metaKey,jdbcType=VARCHAR}
     limit 1
   </select>

@@ -17,4 +17,6 @@ public class PaymentRequest {
 
     private int payment;
 
+    private int skup;
+
 }

@@ -109,7 +109,7 @@ public class SellerOrderPaymentService extends AbstractOrderPaymentService {
      * @return
      */
     public PrepayResponse getAppPayRequest(PaymentRequest request) {
-        BuyerOrderMeta buyerOrderMeta = sellerOrderMetaMapper.selectByMetaKey(request.getUid(), request.getOrderCode(), MetaKey.APP_PAY_REQUEST);
+        SellerOrderMeta buyerOrderMeta = sellerOrderMetaMapper.selectByMetaKey(request.getUid(), request.getSkup(), MetaKey.APP_PAY_REQUEST);
 
         if (buyerOrderMeta == null || StringUtils.isEmpty(buyerOrderMeta.getMetaValue())){
             return null;

@@ -100,6 +100,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
         orderDetailInfo.setOrderCode(order.getOrderCode());
         orderDetailInfo.setButtons(orderStatus.getDetailButtons());
         orderDetailInfo.setSubmitOrderTimeStr(DateUtil.formatDate(order.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS));
+        orderDetailInfo.setUserAddress(addressInfo);
         //卖家
         orderDetailInfo.setIncome(order.getIncome().toPlainString());
         if(Objects.nonNull(computeBo)){
@@ -155,14 +156,14 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
             Integer skupStatus = sellerOrderGoods.getStatus();
             SkupStatus orderStatus = SkupStatus.getSkupStatus(skupStatus);
 
-            BuyerOrderMeta feeMeta = somMapper.selectByMetaKey(uid, orderCode, MetaKey.SELLER_FEE);
+            SellerOrderMeta feeMeta = somMapper.selectByMetaKey(uid, skup, MetaKey.SELLER_FEE);
             boolean metaIsPresent = Objects.nonNull(feeMeta);
             SoldPrdComputeBo computeBo = null;
             if(metaIsPresent){
                 SellerOrderComputeResult computeResult = JSONObject.parseObject(feeMeta.getMetaValue(), SellerOrderComputeResult.class);
                 computeBo = SellerOrderConvertor.computeResult2SoldPrdComputeBo(computeResult);
             }
-            BuyerOrderMeta addressMeta = somMapper.selectByMetaKey(uid, orderCode, MetaKey.BACK_2_SELLER_DELIVERY_ADDRESS);
+            SellerOrderMeta addressMeta = somMapper.selectByMetaKey(uid, skup, MetaKey.BACK_2_SELLER_DELIVERY_ADDRESS);
             AddressInfo addressInfo = JSONObject.parseObject(addressMeta.getMetaValue(), AddressInfo.class);