Sfoglia il codice sorgente

/、.test

release_toaliyun_real
xhxu 4 anni fa
parent
commit
8846f6b267
2 ha cambiato i file con 13 aggiunte e 14 eliminazioni
  1. +13
    -11
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  2. +0
    -3
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 13
- 11
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Vedi File

@@ -2385,17 +2385,19 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
coQ.put("merchantId", user.getMerchantId()); coQ.put("merchantId", user.getMerchantId());
List<WxCouponOrderCVo> avaCoList = this.findAvailCouponOrder(user,cUser.getId(),user.getMerchantId(),null); List<WxCouponOrderCVo> avaCoList = this.findAvailCouponOrder(user,cUser.getId(),user.getMerchantId(),null);
JSONArray couponList = new JSONArray(); JSONArray couponList = new JSONArray();
for(int i=0;i<avaCoList.size();i++) {
WxCouponOrderCVo couponOrderCVo = avaCoList.get(i);
try {
JSONObject couponObj = calcOneCouponPay(couponOrderCVo, payPrice);
couponList.add(couponObj);
} catch (MallinkException e) {
logger.error(e.getMessage(),e);
} catch (Exception e) {
logger.error(e.getMessage(),e);
}
}
if(avaCoList != null && avaCoList.size() > 0){
for(int i=0;i<avaCoList.size();i++) {
WxCouponOrderCVo couponOrderCVo = avaCoList.get(i);
try {
JSONObject couponObj = calcOneCouponPay(couponOrderCVo, payPrice);
couponList.add(couponObj);
} catch (MallinkException e) {
logger.error(e.getMessage(),e);
} catch (Exception e) {
logger.error(e.getMessage(),e);
}
}
}
return couponList; return couponList;
} }




+ 0
- 3
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml Vedi File

@@ -694,9 +694,6 @@
<if test=" null != orderId "> <if test=" null != orderId ">
and co.order_id = #{orderId} and co.order_id = #{orderId}
</if> </if>
<if test=" null != couponId ">
and c.id = #{couponId}
</if>
<if test=" null != cUserId and '' != cUserId"> <if test=" null != cUserId and '' != cUserId">
and co.c_user_id = #{cUserId} and co.c_user_id = #{cUserId}
</if> </if>


Caricamento…
Annulla
Salva