统计销售增加已取消毛利，融资采购赎回状态问题优化

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/dto/SaleDetailDto.java

@@ -117,6 +117,13 @@ public class SaleDetailDto {
 	 */
 	@ExcelProperty(value = "毛利")
 	private BigDecimal profit;
+
+	/**
+	 * 已取消毛利
+	 */
+	@ExcelProperty(value = "已取消毛利")
+	private BigDecimal cancelProfit;
+
 	/**
 	 * 业务日期起
 	 */

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -21,6 +21,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.salesPart.brand.service.IBrandFilesService;
 import org.springblade.salesPart.corps.service.ICorpsAttnService;
 import org.springblade.salesPart.corps.service.ICorpsDescService;
@@ -127,7 +128,9 @@ public class OrderController extends BladeController {
 			.like(ObjectUtils.isNotEmpty(order.getOrdNo()), PjOrder::getOrdNo, order.getOrdNo())//来源单号
 			.like(ObjectUtils.isNotEmpty(order.getRefno()), PjOrder::getRefno, order.getRefno())//参考号
 			.like(ObjectUtils.isNotEmpty(order.getGoodsNameJoin()), PjOrder::getGoodsNameJoin, order.getGoodsNameJoin())//来源单号
-			.like(ObjectUtils.isNotEmpty(order.getBusinessSource()), PjOrder::getBusinessSource, order.getBusinessSource());//来源
+			.like(ObjectUtils.isNotEmpty(order.getBusinessSource()), PjOrder::getBusinessSource, order.getBusinessSource())//来源
+		// zh状态
+			.eq(StringUtil.isNotBlank(order.getWhetherRedeem()), PjOrder::getWhetherRedeem, order.getWhetherRedeem());
 		if (order.getDueDateList() != null && order.getDueDateList().size() > 1) {//应结日期
 			lambdaQueryWrapper.ge(PjOrder::getDueDate, order.getDueDateList().get(0));
 			lambdaQueryWrapper.le(PjOrder::getDueDate, order.getDueDateList().get(1));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shoppingCart/service/impl/ShoppingCartServiceImpl.java

@@ -183,7 +183,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 				if (StringUtil.isNotBlank(k)) {
 					// 如果只有一个公司，订单编号和主编号一致
 					String nowOrderNo = list.size() == 1 ? srcOrdNo: srcOrdNo + "-" + i;
-					// List<PjShoppingCart> shoppingCartList = JSONArray.parseArray(String.valueOf(map.get("list")), PjShoppingCart.class);
+					// List<PjShoppingCart> shoppingCartList = JSON.parseArray(JSON.toJSONString(map.get("list")), PjShoppingCart.class);
 					String jsonStr = JSON.toJSONString(map.get("list"));
 					JSONArray objects = JSONArray.parseArray(jsonStr);
 					List<PjShoppingCart> shoppingCartList = objects.toJavaList(PjShoppingCart.class);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/statistics/service/impl/StatisticsServiceImpl.java

@@ -1103,6 +1103,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 						}
 						if ("已取消".equals(items.getStatus())) {
 							items.setBalanceAmount(new BigDecimal("0.00"));
+							items.setCancelProfit(items.getProfit());
 						} else {
 							if ("TKXS".equals(item.getBsType()) || "TKCG".equals(item.getBsType())) {
 								items.setGoodsNum(new BigDecimal("0.00").subtract(items.getReturnsNumber()));