Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsDesc.java

@@ -220,6 +220,10 @@ public class GoodsDesc implements Serializable {
 
 	@ApiModelProperty(value = "箱重量")
 	private BigDecimal cartonWeight;
+	@ApiModelProperty(value = "积分倍数")
+	private BigDecimal integralMultiples;
+	@ApiModelProperty(value = "兑换积分")
+	private BigDecimal integral;
 
 
 

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/ICorpsDescClient.java

@@ -83,10 +83,10 @@ public interface ICorpsDescClient {
 
 	/**
 	 * 获取商品信息
-	 * @param corpsDesc
+	 * @param cname
 	 * @return
 	 */
 	@GetMapping(GET_CORPS_DESC)
-	CorpsDesc getCorpsDesc(CorpsDesc corpsDesc);
+	CorpsDesc getCorpsDesc(@RequestParam("cname") String cname,@RequestParam("corpType") String corpType);
 
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/IGoodsDescClient.java

@@ -101,7 +101,7 @@ public interface IGoodsDescClient {
 	 */
 	@GetMapping(GET_GOOD_Name)
 	GoodsDesc getGoodName(@RequestParam("cname") String cname,
-						  @RequestParam("corpId") Long corpId);
+						  @RequestParam(value = "corpId",required = false) Long corpId);
 
 
 }

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/DeliveryItems.java

@@ -302,6 +302,11 @@ public class DeliveryItems implements Serializable {
 	 */
 		@ApiModelProperty(value = "供应商名称")
 		private String corpName;
+	/**
+	 * 商品类型 默认0 为商品 1 为赠品
+	 */
+	@ApiModelProperty(value = "商品类型 默认0 为商品 1 为赠品")
+		private int goodType;
 
 
 }

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

@@ -395,4 +395,6 @@ public class OrderItems implements Serializable {
 	private BigDecimal  actualWeight;
 	@ApiModelProperty(value = "产品价格")
 	private BigDecimal  productPrice;
+	@ApiModelProperty(value = "商品类型 默认0 为商品 1 为赠品")
+	private int goodType;
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/OrderItems.java

@@ -364,4 +364,6 @@ public class OrderItems extends OrderBase {
 	private BigDecimal  actualWeight;
 	@ApiModelProperty(value = "产品价格")
 	private BigDecimal  productPrice;
+	@ApiModelProperty(value = "商品类型 默认0 为商品 1 为赠品")
+	private int goodType;
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/feign/CorpsDescClient.java

@@ -20,6 +20,7 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -101,7 +102,11 @@ public class CorpsDescClient implements ICorpsDescClient {
 	}
 
 	@Override
-	public CorpsDesc getCorpsDesc(CorpsDesc corpsDesc) {
+	@GetMapping(GET_CORPS_DESC)
+	public CorpsDesc getCorpsDesc(String cname,String corpType) {
+		CorpsDesc corpsDesc = new CorpsDesc();
+		corpsDesc.setCname(cname);
+		corpsDesc.setCorpType(corpType);
 		corpsDesc.setTenantId(SecureUtil.getTenantId());
 		corpsDesc.setIsDeleted(0);
 		return service.getOne(new QueryWrapper<CorpsDesc>().setEntity(corpsDesc));

blade-service/blade-client/src/main/java/org/springblade/client/goods/mapper/GoodsDescMapper.xml

@@ -56,6 +56,8 @@
         <result column="goods_type_id" property="goodsTypeId"/>
         <result column="corp_id" property="corpId"/>
         <result column="corp_name" property="corpName"/>
+        <result column="integral_multiples" property="integralMultiples"/>
+        <result column="integral" property="integral"/>
     </resultMap>
 
 

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -368,10 +368,10 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 					goodsDesc.setType(0L);
 					goodsDesc.setGoodsTypeId(String.valueOf(goodsType.getId()));
 					//获取供应商
-					CorpsDesc corpsDesc = new CorpsDesc();
+					/*CorpsDesc corpsDesc = new CorpsDesc();
 					corpsDesc.setCname(e.getCorpName());
-					corpsDesc.setCorpType("GYS");
-					CorpsDesc corpByName = corpsDescClient.getCorpsDesc(corpsDesc);
+					corpsDesc.setCorpType("GYS");*/
+					CorpsDesc corpByName = corpsDescClient.getCorpsDesc(e.getCorpName(),"GYS");
 					if (corpByName != null){
 						goodsDesc.setCorpId(corpByName.getId());
 						goodsDesc.setCorpName(corpByName.getCname());

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryItemsMapper.xml

@@ -46,6 +46,7 @@
         <result column="delivery_status" property="deliveryStatus"/>
         <result column="corp_id" property="corpId"/>
         <result column="corp_name" property="corpName"/>
+        <result column="good_type" property="goodType"/>
     </resultMap>
 
 

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/mapper/PriceBankMapper.xml

@@ -58,7 +58,7 @@
 		price_three_time = price_two_time,
 		price_two = price_one,
 		price_two_time = price_one_time,
-		price_one = price,
+		price_one = purchase_amount,
 		price_one_time = price_time
 	WHERE
 		id = #{id}

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/PriceBankServiceImpl.java

@@ -53,8 +53,8 @@ import java.util.List;
 @Service
 @AllArgsConstructor
 public class PriceBankServiceImpl extends ServiceImpl<PriceBankMapper, PriceBank> implements IPriceBankService {
-	private ICorpsDescClient corpsDescClient;//获取客户信息
-	private IGoodsDescClient goodsDescClient;//商品信息
+	private final ICorpsDescClient corpsDescClient;//获取客户信息
+	private final IGoodsDescClient goodsDescClient;//商品信息
 	private IUserClient userClient;//用户信息
 	@Override
 	public IPage<PriceBankVO> selectPriceBankPage(IPage<PriceBankVO> page, PriceBankVO priceBank) {
@@ -144,10 +144,10 @@ public class PriceBankServiceImpl extends ServiceImpl<PriceBankMapper, PriceBank
 			//采购报价=单价 / (1+税率/100) *（1+FOB系数/100）
 			priceBank.setPurchaseAmount(priceBank.getPrice().divide((new BigDecimal(1).add((priceBank.getTaxRate().divide(new BigDecimal(100))))),4).multiply(new BigDecimal(1).add((priceBank.getCoefficient().divide(new BigDecimal(100))))));
 			if (StringUtils.isNotBlank(item.getCorpName())){
-				CorpsDesc corpsDesc = new CorpsDesc();
+				/*CorpsDesc corpsDesc = new CorpsDesc();
 				corpsDesc.setCname(item.getCorpName());
-				corpsDesc.setCorpType("GYS");
-				CorpsDesc corpByName = corpsDescClient.getCorpsDesc(corpsDesc);
+				corpsDesc.setCorpType("GYS");*/
+				CorpsDesc corpByName = corpsDescClient.getCorpsDesc(item.getCorpName(),"GYS");
 				if (corpByName != null){
 					priceBank.setCorpName(item.getCorpName());//供应商
 					priceBank.setCorpId(corpByName.getId());//供应商id

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderItemsMapper.xml

@@ -65,6 +65,7 @@
         <result column="exchange_rate" property="exchangeRate"/>
         <result column="coefficient" property="coefficient"/>
         <result column="product_price" property="productPrice"/>
+        <result column="good_type" property="goodType"/>
     </resultMap>
 
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderItemsMapper.xml

@@ -56,6 +56,7 @@
         <result column="exchange_rate" property="exchangeRate"/>
         <result column="coefficient" property="coefficient"/>
         <result column="product_price" property="productPrice"/>
+        <result column="good_type" property="goodType"/>
     </resultMap>