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

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/funding/controller/PjpfBalanceResetController.java

@@ -34,8 +34,6 @@ import org.springblade.salesPart.funding.service.IPjpfBalanceResetService;
 import org.springblade.salesPart.funding.vo.PjpfBalanceResetVO;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-
 /**
  * 可用余额充值 控制器
  *
@@ -93,7 +91,7 @@ public class PjpfBalanceResetController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入pjpfBalanceReset")
-	public R save(@Valid @RequestBody PjpfBalanceReset pjpfBalanceReset) {
+	public R save(@RequestBody PjpfBalanceReset pjpfBalanceReset) {
 		return R.status(pjpfBalanceResetService.save(pjpfBalanceReset));
 	}
 
@@ -103,7 +101,7 @@ public class PjpfBalanceResetController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入pjpfBalanceReset")
-	public R update(@Valid @RequestBody PjpfBalanceReset pjpfBalanceReset) {
+	public R update(@RequestBody PjpfBalanceReset pjpfBalanceReset) {
 		return R.status(pjpfBalanceResetService.updateById(pjpfBalanceReset));
 	}
 
@@ -113,7 +111,7 @@ public class PjpfBalanceResetController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入pjpfBalanceReset")
-	public R submit(@Valid @RequestBody PjpfBalanceReset pjpfBalanceReset) {
+	public R submit(@RequestBody PjpfBalanceReset pjpfBalanceReset) {
 		return pjpfBalanceResetService.submit(pjpfBalanceReset);
 	}
 
@@ -132,7 +130,7 @@ public class PjpfBalanceResetController extends BladeController {
 	 * 确认
 	 */
 	@PostMapping("/confirming")
-	public R confirming(@Valid @RequestBody PjpfBalanceReset pjpfBalanceReset) {
+	public R confirming(@RequestBody PjpfBalanceReset pjpfBalanceReset) {
 		return pjpfBalanceResetService.confirming(pjpfBalanceReset);
 	}
 
@@ -140,7 +138,7 @@ public class PjpfBalanceResetController extends BladeController {
 	 * 撤销
 	 */
 	@PostMapping("/revoke")
-	public R revoke(@Valid @RequestBody PjpfBalanceReset pjpfBalanceReset) {
+	public R revoke(@RequestBody PjpfBalanceReset pjpfBalanceReset) {
 		return pjpfBalanceResetService.revoke(pjpfBalanceReset);
 	}
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderMapper.xml

@@ -535,8 +535,8 @@
             if(SUM( poi.send_num ),SUM( poi.send_num ),0) AS number
         FROM
             pjpf_order_items poi
-                LEFT JOIN pjpf_order po ON poi.pid = po.id
-                LEFT JOIN pjpf_brand_desc pbd ON poi.brand_id = pbd.id
+                inner JOIN pjpf_order po ON poi.pid = po.id
+                inner JOIN pjpf_brand_desc pbd ON poi.brand_id = pbd.id
         WHERE
             po.tenant_id = #{tenantId}
           AND po.is_deleted = '0'

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -1391,6 +1391,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					}
 					goodsName.append(goodsDesc.getCname()).append(",");
 					retrieval.append(goodsDesc.getCnameInt()).append(",");
+					item.setBrandId(goodsDesc.getBrandId());
 					item.setBrandName(goodsDesc.getBrandName());
 					item.setCostprie(item.getReturnsNumber().multiply(item.getCostpriePrice()));
 					item.setGrossProfit(item.getReturnsAmount().subtract(item.getCostprie()));
@@ -1504,6 +1505,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					item.setRebateCostprie(item.getReturnsNumber().multiply(item.getRebatePrice()));
 					item.setGrossProfit(item.getReturnsAmount().subtract(item.getCostprie()));
 					item.setRebateProfit(item.getReturnsAmount().subtract(item.getRebateCostprie()));
+					item.setBrandId(goodsDesc.getBrandId());
 					item.setBrandName(goodsDesc.getBrandName());
 				});
 				if (goodsName.length() > 0) {
@@ -3933,6 +3935,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				if (ObjectUtil.isEmpty(goodsDesc)) {
 					throw new RuntimeException("商品数据异常");
 				}
+				item.setBrandId(goodsDesc.getBrandId());
 				item.setBrandName(goodsDesc.getBrandName());
 				//计算成本
 				goodsName.append(goodsDesc.getCname()).append(",");
@@ -4914,6 +4917,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					if (ObjectUtil.isEmpty(goodsDesc)) {
 						throw new RuntimeException("商品数据异常");
 					}
+					item.setBrandId(goodsDesc.getBrandId());
 					item.setBrandName(goodsDesc.getBrandName());
 					if (!"JF".equals(order.getBsType())) {
 						if (!pjStockDescList.isEmpty()) {
@@ -5401,6 +5405,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					}
 					goodsName.append(goodsDesc.getCname()).append(",");
 					retrieval.append(goodsDesc.getCnameInt()).append(",");
+					item.setBrandId(goodsDesc.getBrandId());
 					item.setBrandName(goodsDesc.getBrandName());
 				}
 				orderItemsService.saveOrUpdateBatch(order.getOrderItemsList());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -4516,9 +4516,9 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					stockDesc.setStoreInventory(stockDesc.getBalanceQuantity());
 					BigDecimal inventoryAmount = item.getSendNum().multiply(stockOne.getInventoryCostPrice());
 					BigDecimal rebateInventoryAmount = item.getSendNum().multiply(stockOne.getRebatePrice());
-					stockDesc.setInventoryAmount(stockOne.getInventoryAmount().add(inventoryAmount));
-					stockDesc.setRebateInventoryAmount(stockOne.getRebateInventoryAmount().add(rebateInventoryAmount));
-					stockDesc.setInventoryCostPrice(stockDesc.getInventoryAmount().divide(stockDesc.getBalanceQuantity(), RoundingMode.DOWN).setScale(2, RoundingMode.DOWN));
+					stockDesc.setInventoryAmount(inventoryAmount.compareTo(BigDecimal.ZERO) == 0 ? item.getSendNum().multiply(item.getCostpriePrice()) : stockOne.getInventoryAmount().add(inventoryAmount));
+					stockDesc.setRebateInventoryAmount(inventoryAmount.compareTo(BigDecimal.ZERO) == 0 ? item.getSendNum().multiply(item.getRebatePrice()) : stockOne.getRebateInventoryAmount().add(rebateInventoryAmount));
+					stockDesc.setInventoryCostPrice(inventoryAmount.compareTo(BigDecimal.ZERO) == 0 ? item.getCostpriePrice() : stockDesc.getInventoryAmount().divide(stockDesc.getBalanceQuantity(), RoundingMode.DOWN).setScale(2, RoundingMode.DOWN));
 					stockDesc.setVersion(stockOne.getVersion());
 					pjStockDescArrayListUpdate.add(stockDesc);
 				}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shoppingCart/controller/ShoppingCartController.java

@@ -33,9 +33,12 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.pay.tonglianPayment.entity.Parameters;
+import org.springblade.pay.tonglianPayment.fegin.IPaymentClient;
 import org.springblade.salesPart.entity.PjProductLaunch;
 import org.springblade.salesPart.entity.PjProductLaunchFiles;
 import org.springblade.salesPart.entity.PjShoppingCart;
+import org.springblade.salesPart.payMethod.PayService;
 import org.springblade.salesPart.productLaunch.service.IProductLaunchFilesService;
 import org.springblade.salesPart.shoppingCart.service.IShoppingCartService;
 import org.springblade.salesPart.vo.ShoppingCartVO;
@@ -61,6 +64,8 @@ public class ShoppingCartController extends BladeController {
 	private final IShoppingCartService shoppingCartService;
 	private final IProductLaunchFilesService productLaunchFilesService;
 
+	private final IPaymentClient paymentClient;
+
 	/**
 	 * 详情
 	 */
@@ -232,5 +237,16 @@ public class ShoppingCartController extends BladeController {
 		return shoppingCartService.generateOrderShare(pjShoppingCart.getAddress(), pjShoppingCart.getShoppingCartList(), pjShoppingCart.getPayType());
 	}
 
+	@PostMapping("/getPaymentType")
+	public R<String> getPaymentType() {
+		R<Parameters> parametersR = paymentClient.getByTenantId(AuthUtil.getTenantId());
+		if (!parametersR.isSuccess()) {
+			return R.fail("未查到支付类型");
+		}
+		if (ObjectUtil.isEmpty(parametersR.getData())) {
+			return R.fail("未查到支付类型数据");
+		}
+		return R.data(parametersR.getData().getPayType());
+	}
 
 }