ufo / yohoufo-fore · Commits

Go to a project

Authored by sailing-PC\sailing
Commit 39b6c25424405e0393e32fa78a6eb254b2fcd1d2 1 parent e1cb5706

fix

Inline Side-by-side
Showing 6 changed files with 9 additions and 5 deletions
@@ -17,5 +17,5 @@ public interface SellerOrderMetaMapper { @@ -17,5 +17,5 @@ public interface SellerOrderMetaMapper {
17 17
18 int updateByPrimaryKey(SellerOrderMeta record); 18 int updateByPrimaryKey(SellerOrderMeta record);
19 19
20 - BuyerOrderMeta selectByMetaKey(@Param("uid") int uid, @Param("orderCode") long orderCode, @Param("metaKey") String metaKey); 20 + SellerOrderMeta selectByMetaKey(@Param("uid") int uid, @Param("skup") int skup, @Param("metaKey") String metaKey);
21 } 21 }
@@ -58,6 +58,7 @@ @@ -58,6 +58,7 @@
58 <select id="selectByUidStatusList" resultMap="BaseResultMap"> 58 <select id="selectByUidStatusList" resultMap="BaseResultMap">
59 select <include refid="Base_Column_List" /> from seller_order_goods 59 select <include refid="Base_Column_List" /> from seller_order_goods
60 where <include refid="sql_where_4_select_UidStatusList"/> 60 where <include refid="sql_where_4_select_UidStatusList"/>
  61 + limit #{offset, jdbcType=INTEGER}, #{limit, jdbcType=INTEGER}
61 </select> 62 </select>
62 63
63 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> 64 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 <include refid="Base_Column_List" /> 34 <include refid="Base_Column_List" />
35 from seller_order_meta 35 from seller_order_meta
36 where uid = #{uid,jdbcType=INTEGER} 36 where uid = #{uid,jdbcType=INTEGER}
37 - and order_code = #{orderCode,jdbcType=BIGINT} 37 + and skup = #{skup,jdbcType=BIGINT}
38 and meta_key = #{metaKey,jdbcType=VARCHAR} 38 and meta_key = #{metaKey,jdbcType=VARCHAR}
39 limit 1 39 limit 1
40 </select> 40 </select>
@@ -17,4 +17,6 @@ public class PaymentRequest { @@ -17,4 +17,6 @@ public class PaymentRequest {
17 17
18 private int payment; 18 private int payment;
19 19
  20 + private int skup;
  21 +
20 } 22 }
@@ -109,7 +109,7 @@ public class SellerOrderPaymentService extends AbstractOrderPaymentService { @@ -109,7 +109,7 @@ public class SellerOrderPaymentService extends AbstractOrderPaymentService {
109 * @return 109 * @return
110 */ 110 */
111 public PrepayResponse getAppPayRequest(PaymentRequest request) { 111 public PrepayResponse getAppPayRequest(PaymentRequest request) {
112 - BuyerOrderMeta buyerOrderMeta = sellerOrderMetaMapper.selectByMetaKey(request.getUid(), request.getOrderCode(), MetaKey.APP_PAY_REQUEST); 112 + SellerOrderMeta buyerOrderMeta = sellerOrderMetaMapper.selectByMetaKey(request.getUid(), request.getSkup(), MetaKey.APP_PAY_REQUEST);
113 113
114 if (buyerOrderMeta == null || StringUtils.isEmpty(buyerOrderMeta.getMetaValue())){ 114 if (buyerOrderMeta == null || StringUtils.isEmpty(buyerOrderMeta.getMetaValue())){
115 return null; 115 return null;
@@ -100,6 +100,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -100,6 +100,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
100 orderDetailInfo.setOrderCode(order.getOrderCode()); 100 orderDetailInfo.setOrderCode(order.getOrderCode());
101 orderDetailInfo.setButtons(orderStatus.getDetailButtons()); 101 orderDetailInfo.setButtons(orderStatus.getDetailButtons());
102 orderDetailInfo.setSubmitOrderTimeStr(DateUtil.formatDate(order.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS)); 102 orderDetailInfo.setSubmitOrderTimeStr(DateUtil.formatDate(order.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS));
  103 + orderDetailInfo.setUserAddress(addressInfo);
103 //卖家 104 //卖家
104 orderDetailInfo.setIncome(order.getIncome().toPlainString()); 105 orderDetailInfo.setIncome(order.getIncome().toPlainString());
105 if(Objects.nonNull(computeBo)){ 106 if(Objects.nonNull(computeBo)){
@@ -155,14 +156,14 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -155,14 +156,14 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
155 Integer skupStatus = sellerOrderGoods.getStatus(); 156 Integer skupStatus = sellerOrderGoods.getStatus();
156 SkupStatus orderStatus = SkupStatus.getSkupStatus(skupStatus); 157 SkupStatus orderStatus = SkupStatus.getSkupStatus(skupStatus);
157 158
158 - BuyerOrderMeta feeMeta = somMapper.selectByMetaKey(uid, orderCode, MetaKey.SELLER_FEE); 159 + SellerOrderMeta feeMeta = somMapper.selectByMetaKey(uid, skup, MetaKey.SELLER_FEE);
159 boolean metaIsPresent = Objects.nonNull(feeMeta); 160 boolean metaIsPresent = Objects.nonNull(feeMeta);
160 SoldPrdComputeBo computeBo = null; 161 SoldPrdComputeBo computeBo = null;
161 if(metaIsPresent){ 162 if(metaIsPresent){
162 SellerOrderComputeResult computeResult = JSONObject.parseObject(feeMeta.getMetaValue(), SellerOrderComputeResult.class); 163 SellerOrderComputeResult computeResult = JSONObject.parseObject(feeMeta.getMetaValue(), SellerOrderComputeResult.class);
163 computeBo = SellerOrderConvertor.computeResult2SoldPrdComputeBo(computeResult); 164 computeBo = SellerOrderConvertor.computeResult2SoldPrdComputeBo(computeResult);
164 } 165 }
165 - BuyerOrderMeta addressMeta = somMapper.selectByMetaKey(uid, orderCode, MetaKey.BACK_2_SELLER_DELIVERY_ADDRESS); 166 + SellerOrderMeta addressMeta = somMapper.selectByMetaKey(uid, skup, MetaKey.BACK_2_SELLER_DELIVERY_ADDRESS);
166 AddressInfo addressInfo = JSONObject.parseObject(addressMeta.getMetaValue(), AddressInfo.class); 167 AddressInfo addressInfo = JSONObject.parseObject(addressMeta.getMetaValue(), AddressInfo.class);
167 168
168 169