|
@@ -16,6 +16,7 @@ import com.fs.api.vo.OrderListVO;
|
|
|
import com.fs.api.vo.ProductListVO;
|
|
import com.fs.api.vo.ProductListVO;
|
|
|
import com.fs.common.config.FSSysConfig;
|
|
import com.fs.common.config.FSSysConfig;
|
|
|
import com.fs.common.core.domain.R;
|
|
import com.fs.common.core.domain.R;
|
|
|
|
|
+import com.fs.common.core.domain.entity.SysDictData;
|
|
|
import com.fs.common.core.redis.RedisCache;
|
|
import com.fs.common.core.redis.RedisCache;
|
|
|
import com.fs.common.event.TemplateBean;
|
|
import com.fs.common.event.TemplateBean;
|
|
|
import com.fs.common.event.TemplateEvent;
|
|
import com.fs.common.event.TemplateEvent;
|
|
@@ -76,6 +77,7 @@ import com.fs.hisStore.domain.*;
|
|
|
import com.fs.hisStore.enums.*;
|
|
import com.fs.hisStore.enums.*;
|
|
|
import com.fs.hisStore.service.*;
|
|
import com.fs.hisStore.service.*;
|
|
|
import com.fs.system.service.ISysConfigService;
|
|
import com.fs.system.service.ISysConfigService;
|
|
|
|
|
+import com.fs.system.service.ISysDictTypeService;
|
|
|
import com.fs.ybPay.domain.RefundResult;
|
|
import com.fs.ybPay.domain.RefundResult;
|
|
|
import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
|
|
import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
|
|
|
import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
|
|
import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
|
|
@@ -2467,7 +2469,26 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public List<FsStoreOrderExportVO> selectFsStoreOrderListVOByExport(FsStoreOrderParam param) {
|
|
public List<FsStoreOrderExportVO> selectFsStoreOrderListVOByExport(FsStoreOrderParam param) {
|
|
|
- return fsStoreOrderMapper.selectFsStoreOrderListVOByExport(param);
|
|
|
|
|
|
|
+
|
|
|
|
|
+ List<FsStoreOrderExportVO> list=fsStoreOrderMapper.selectFsStoreOrderListVOByExport(param);
|
|
|
|
|
+ list.forEach(vo -> {
|
|
|
|
|
+ if (StringUtils.isNotEmpty(vo.getItemJson())) {
|
|
|
|
|
+ JSONArray jsonArray = JSONUtil.parseArray(vo.getItemJson());
|
|
|
|
|
+ List<FsStoreOrderItemVO> items = JSONUtil.toList(jsonArray, FsStoreOrderItemVO.class);
|
|
|
|
|
+ if (items!=null && !items.isEmpty()) {
|
|
|
|
|
+ StringBuilder sb = new StringBuilder();
|
|
|
|
|
+ for (FsStoreOrderItemVO item : items) {
|
|
|
|
|
+ String jsonInfo = item.getJsonInfo();
|
|
|
|
|
+ Map<String, Object> map = JSONUtil.parseObj(jsonInfo);
|
|
|
|
|
+ String productName = String.valueOf(map.get("productName"));
|
|
|
|
|
+ sb.append(productName).append("*").append(item.getNum()).append(System.lineSeparator());
|
|
|
|
|
+ }
|
|
|
|
|
+ vo.setProductNames(sb.toString());
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
|
|
+ return list;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|