Merge branch 'master-invoice-modular' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -4,8 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -38,7 +36,6 @@ import com.xxfc.platform.universal.vo.OrderRefundVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.jexl2.MapContext;
-import org.apache.commons.lang3.StringUtils;
 import org.mockito.internal.util.collections.Sets;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -805,21 +802,8 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         BigDecimal bigDecimal = new BigDecimal("0");
         if (list != null && list.size() > 0) {
             list.parallelStream().forEach(result -> {
-                if(StringUtils.isNotBlank(result.getAccountDetail())) {
-                    JSONObject jsonObject = JSONObject.parseObject(result.getAccountDetail());
-                    log.info("获取订单的费用金额：", jsonObject.toJSONString());
-                    if (jsonObject != null) {
-                        JSONArray jsonArray = jsonObject.getJSONArray("deductions");
-                        if(jsonArray != null && jsonArray.size() > 0) {
-                            for (int i =0; i<jsonArray.size(); i++) {
-                                JSONObject jsonObject1 = jsonArray.getJSONObject(i);
-                                if (jsonObject1 != null) {
-                                    bigDecimal.add(new BigDecimal(jsonObject1.getString("amount")));
-                                }
-                            }
-                            log.info("获取订单的费用金额： {}", bigDecimal);
-                        }
-                    }
+                if(result.getAccountAmount() != null) {
+                    bigDecimal.add(result.getAccountAmount());
                 }
             });
         }