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

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

@@ -635,13 +635,13 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 	}
 	public R updateOverpayment(Delivery delivery,List<DeliveryItems> list){
 		String type = null;
-		if (delivery.getOverpayment().equals(OverpaymentEnum.REDUCE.getType())){//收货赠送积分
+		if (delivery.getOverpayment().equals(OverpaymentEnum.REDUCE.getType())){//收货加溢付款
 			type = OverpaymentEnum.ADD.getType();
-		}else if (delivery.getOverpayment().equals(OverpaymentEnum.REPEALREDUCE.getType())){//撤销收货撤销赠送积分
+		}else if (delivery.getOverpayment().equals(OverpaymentEnum.REPEALREDUCE.getType())){//撤销收货撤销增加溢付款
 			type = OverpaymentEnum.REPEALADD.getType();
-		}else if (delivery.getOverpayment().equals(OverpaymentEnum.ADD.getType())){//确认发货消费积分
+		}else if (delivery.getOverpayment().equals(OverpaymentEnum.ADD.getType())){//
 			type = OverpaymentEnum.REDUCE.getType();
-		}else if (delivery.getOverpayment().equals(OverpaymentEnum.REPEALADD.getType())){//撤销发货撤销消费积分
+		}else if (delivery.getOverpayment().equals(OverpaymentEnum.REPEALADD.getType())){
 			type = OverpaymentEnum.REPEALREDUCE.getType();
 		}
 		BigDecimal amount = new BigDecimal(BigInteger.ZERO);

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

@@ -122,12 +122,14 @@ public class BusinessOverpaymentServiceImpl extends ServiceImpl<BusinessOverpaym
 					businessOverpaymentItem.setCreateUser(SecureUtil.getUserId());
 					businessOverpaymentItem.setCreateTime(new Date());
 					businessOverpaymentItem.setTenantId(SecureUtil.getTenantId());
+					businessOverpaymentItem.setOverpaymentType(0);
 					businessOverpaymentItemMapper.insert(businessOverpaymentItem);
 				}else {
 					businessOverpaymentItem.setPid(pid);
 					businessOverpaymentItem.setUpdateUser(SecureUtil.getUserId());
 					businessOverpaymentItem.setUpdateTime(new Date());
 					businessOverpaymentItem.setTenantId(SecureUtil.getTenantId());
+					businessOverpaymentItem.setOverpaymentType(1);
 					businessOverpaymentItemMapper.updateById(businessOverpaymentItem);
 				}
 			}

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

@@ -106,6 +106,7 @@ public class BusinessPointsServiceImpl extends ServiceImpl<BusinessPointsMapper,
 				throw new RuntimeException("暂时不能消费,目前可消费积分为:"+businessPoints.getBalancePoints());
 			}
 			pid = businessPoints.getId();
+			baseMapper.updatePoints(convertIntegral,presenterIntegral,new Date(),SecureUtil.getUserId(),businessPoints.getId(),type);
 		}else if (type.equals(OverpaymentEnum.REPEALREDUCE.getType())){ //撤销消费积分
 			pid = businessPoints.getId();
 			baseMapper.updatePoints(convertIntegral,presenterIntegral,new Date(),SecureUtil.getUserId(),businessPoints.getId(),type);

blade-service/blade-stock/src/main/java/org/springblade/stock/service/impl/StockGoodsServiceImpl.java

@@ -128,7 +128,7 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 			if (stockGoods.getInQuantity() == null){
 				stockGoods.setInQuantity(datum.getBalanceQuantity());
 			}
-			stockGoods.setTradeType("CN");
+			stockGoods.setTradeType("GN");
 			stockGoods.setTenantId(SecureUtil.getTenantId());
 			//获取商品id
 			R<GoodsDesc> goodsDesc = goodsDescClient.GoodsByCode(datum.getCode());