|
@@ -48,6 +48,7 @@ import org.apache.http.client.methods.HttpPost;
|
|
|
import org.apache.http.client.utils.URIBuilder;
|
|
|
import org.apache.http.entity.StringEntity;
|
|
|
import org.apache.http.util.EntityUtils;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
@@ -121,10 +122,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
);
|
|
|
|
|
|
// 实体转换
|
|
|
- Page<PayOrderVO> pageResult = converter.entity2Page(dictItemPage);
|
|
|
-
|
|
|
- if(CollectionUtil.isNotEmpty(pageResult.getRecords())){
|
|
|
- List<PayOrderVO> list = pageResult.getRecords().stream().map(item -> {
|
|
|
+ Page<PayOrderVO> pageResult = new Page<>();
|
|
|
+ if(CollectionUtil.isNotEmpty(dictItemPage.getRecords())){
|
|
|
+ List<PayOrderVO> list = dictItemPage.getRecords().stream().map(i -> {
|
|
|
+ PayOrderVO item = new PayOrderVO();
|
|
|
+ BeanUtils.copyProperties(i,item,"id");
|
|
|
+ item.setId(i.getId().toString());
|
|
|
Integer amountsPayable = item.getAmountsPayable();
|
|
|
if (amountsPayable != null) {
|
|
|
item.setAmountActuallyPaid(new BigDecimal(amountsPayable).divide(new BigDecimal(100)));
|