Merge remote-tracking branch 'origin/dev_stone' into dev_stone

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java

@@ -232,24 +232,21 @@ public class OrderUtils {
      * @return
      */
     public HashMap<String, Object> useCoupon(String uCouponId, String content, BigDecimal totalPrice, String performanceId, String timesId, String ticketId) {
+        HashMap<String, Object> hashMap = CollectionUtil.mapStringObject();
+        try {
             MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
             params.add("uCouponId", uCouponId);
             params.add("content", content);
             params.add("totalPrice", totalPrice.toString());
-
             params.add("goodId", "-1");
             params.add("performanceId", performanceId);
             params.add("timeId", timesId);
             params.add("ticketId", ticketId);
-
             MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
             header.add("Authorization", "Bearer " + CurrentUtil.getToken());
-        log.info("url=" + candyUrl + "/candy-coupon/use");
-        log.info("params=" + JSON.toJSONString(params));
             String returnData = HttpUtil.post(candyUrl + "/candy-coupon/use", params, header);
             InnerReturnVo<CandyUseResultVo> innerReturnVo = JsonUtils.fromJson(returnData, new TypeReference<InnerReturnVo<CandyUseResultVo>>() {
             });
-        log.info("returnData=" + returnData);
             CandyUseResultVo candyUseResultVo = innerReturnVo.getData();
             Integer type = candyUseResultVo.getCouType();
             BigDecimal value = candyUseResultVo.getValue();
@@ -274,19 +271,25 @@ public class OrderUtils {
                     voucher = BigDecimal.ZERO;
                     break;
             }
-        HashMap<String, Object> hashMap = CollectionUtil.mapStringObject();
             hashMap.put("type", type);
             hashMap.put("voucher", voucher.setScale(2, BigDecimal.ROUND_HALF_UP));
             return hashMap;
+        }catch (Exception e){
+            log.error("用券ERROR:{}",e);
+            hashMap.put("type", -1);
+            hashMap.put("voucher", -1);
+            return hashMap;
+        }
     }
 
     public void backAdvanceCoupon(String advanceCode, String uid) {
         if (advanceCode != null) {
-            backCoupon(advanceCode.toString(), uid);
+            backCoupon(advanceCode, uid);
         }
     }
 
     public void backCoupon(String uCouponId, String uid) {
+        try {
             BackCouponParam param = BackCouponParam.getNew();
             param.setuCouponIds(uCouponId);
             param.setUid(uid);
@@ -298,6 +301,9 @@ public class OrderUtils {
             params.add(param);
             String jsonString = JSON.toJSONString(params);
             String returnData = HttpUtil.postRaw(candyUrl + "/candy-coupon/useBack", jsonString, header);
+        }catch (Exception e){
+            log.error("回退券ERROR:{}",e);
+        }
     }
 
     /**