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

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/PriceItem.java

@@ -192,5 +192,8 @@ public class PriceItem implements Serializable {
 		@ApiModelProperty(value = "产地")
 		private String placeProduction;
 
+		private BigDecimal freightFees;
+
+		private BigDecimal labelFees;
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -718,4 +718,11 @@ public class Order implements Serializable {
 	private String pageStatus;
 	@TableField(exist = false)
 	private String pageLabel;
+
+	//是否包含运费
+	private Integer isFreight;
+	//是否包含标签
+	private Integer isLabel;
+    //客户对应的分管员
+	private String chargeMember;
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vojo/Items.java

@@ -214,4 +214,7 @@ public class Items implements Serializable {
 	private int srcType;
 
 	private String tradeType;
+
+
+	private String chargeMember;
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -232,10 +232,10 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 			}
 		}
 		// todo 溢付款
-		/*R overpayment = this.updateOverpayment(delivery, collect);
+		R overpayment = this.updateOverpayment(delivery, collect);
 		if (!overpayment.isSuccess()){
 			throw new RuntimeException(overpayment.getMsg());
-		}*/
+		}
 		return deliveryItemsList;
 	}
 	/**

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceItemController.java

@@ -18,10 +18,12 @@ package org.springblade.mocha.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 
 import javax.servlet.http.HttpServletResponse;
@@ -29,12 +31,14 @@ import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.mocha.excel.PriceImport;
 import org.springblade.mocha.excel.PriceItemExcel;
+import org.springblade.system.entity.AuthClient;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.mocha.entity.PriceItem;
@@ -43,8 +47,10 @@ import org.springblade.mocha.service.IPriceItemService;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 价格管理明细表 控制器
@@ -164,5 +170,45 @@ public class PriceItemController extends BladeController {
 		return R.success("操作成功");
 	}
 
+	/**
+	 * 获取销售价格
+	 * */
+	@GetMapping("getSalePrice")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "获取销售价格", notes = "传入excel")
+	public R getSalePrice(@ApiParam(value = "大字", required = true) @RequestParam String code,
+						  @ApiParam(value = "是否运费", required = true) @RequestParam Integer isFreight,
+						  @ApiParam(value = "是否标签", required = true) @RequestParam Integer isLabel)
+	{
+		        BigDecimal saleMoney=BigDecimal.ZERO;
+				BigDecimal reduce=BigDecimal.ZERO;
+				BigDecimal freight=BigDecimal.ZERO;
+				BigDecimal label=BigDecimal.ZERO;
+		        LambdaQueryWrapper<PriceItem> priceItemLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		        priceItemLambdaQueryWrapper
+					.eq(PriceItem::getIsDeleted,0)
+					.eq(PriceItem::getTenantId, AuthUtil.getTenantId())
+					.eq(PriceItem::getCode,code);
+		        List<PriceItem> priceItemList = priceItemService.list(priceItemLambdaQueryWrapper);
+
+		        if(CollectionUtils.isNotEmpty(priceItemList))
+		        {
+
+					reduce = priceItemList.stream().filter(e -> e.getSalesPrice() != null).map(PriceItem::getSalesPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+					if(isFreight!=null && isFreight==1)
+					{
+						freight=priceItemList.stream().filter(e -> e.getFreightFees() != null).map(PriceItem::getFreightFees).reduce(BigDecimal.ZERO, BigDecimal::add);
+					}
+					if(isLabel!=null && isLabel==1)
+					{
+						label=priceItemList.stream().filter(e -> e.getLabelFees() != null).map(PriceItem::getLabelFees).reduce(BigDecimal.ZERO, BigDecimal::add);
+					}
+
+				}
+		       saleMoney=(reduce.add(freight)).add(label);
+
+		return R.data(saleMoney);
+	}
+
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -417,6 +417,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				selectById.setCorpId(item.getCorpId());
 				selectById.setSrcOrderNo(selectById.getSysNo());
 				selectById.setId(null);
+				selectById.setStatus(0);
 				selectById.setSysNo((String) billNo.getData());
 				selectById.setTenantId(SecureUtil.getTenantId());
 				selectById.setCreateTime(new Date());

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -566,7 +566,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		settlement.setSysNo(String.valueOf(System.currentTimeMillis()));
 		settlement.setCreateTime(new Date());
 		//人民币总金额
-		//settlement.setAmount(total);
+		settlement.setAmount(total);
 		//外币总金额
 		//settlement.setForeignAmount(foreignTotal);
 		settlement.setTenantId(AuthUtil.getTenantId());

blade-service/trade-finance/src/main/java/org/springblade/finance/tool/JdyTool.java

@@ -9,6 +9,7 @@ import com.jdy.v7sdk.business.models.errorInfo;
 import com.jdy.v7sdk.models.AccountGroupRequest;
 import com.github.kevinsawicki.http.HttpRequest;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.formula.functions.T;
 import org.springblade.finance.TokenRequestQuery;
 import org.springblade.finance.vojo.JDYitems;
@@ -19,6 +20,7 @@ import java.util.List;
 /**
  * 金蝶测试demo, 如果需要正式的,则需要替换
  * */
+@Slf4j
 public class JdyTool
 {
 
@@ -93,8 +95,12 @@ public class JdyTool
 
 
 		String body = httpRequest.body().toString();
+		log.info("请求结果:"+body);
 		//获取返回对象
 		JDYSaveResponse  saveResponse = JSONObject.parseObject(body, JDYSaveResponse.class);
+		log.info("请求结果结果:"+saveResponse.getSuccess());
+		log.info("请求结果状态码:"+saveResponse.getErrorCode());
+		/*log.info("请求返回体:"+saveResponse.toString());*/
 		//获取主表id
 		List<String> successPkIds = saveResponse.getData().get(0).getSuccessPkIds();
 		/*System.out.println("请求body===="+httpRequest.body().toString());