2023年3月9日17:44:33

blade-service-api/blade-client-api/src/main/java/org/springblade/client/dto/ParametersDTO.java → blade-service-api/blade-payment-api/src/main/java/org/springblade/pay/tonglianPayment/dto/ParametersDTO.java

@@ -14,11 +14,11 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.client.dto;
+package org.springblade.pay.tonglianPayment.dto;
 
-import org.springblade.client.entity.Parameters;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.pay.tonglianPayment.entity.Parameters;
 
 /**
  * 支付参数表数据传输对象实体类

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/Parameters.java → blade-service-api/blade-payment-api/src/main/java/org/springblade/pay/tonglianPayment/entity/Parameters.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.client.entity;
+package org.springblade.pay.tonglianPayment.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/ITongLianPaymentClient.java → blade-service-api/blade-payment-api/src/main/java/org/springblade/pay/tonglianPayment/fegin/ITongLianPaymentClient.java

@@ -1,19 +1,12 @@
-package org.springblade.client.feign;
+package org.springblade.pay.tonglianPayment.fegin;
 
-import org.springblade.client.entity.CommonFile;
-import org.springblade.client.entity.Parameters;
-import org.springblade.common.constant.LauncherConstant;
-import org.springblade.core.tool.api.R;
+import org.springblade.pay.tonglianPayment.entity.Parameters;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
 
 @FeignClient(
-	value = LauncherConstant.APPLICATION_CLIENT_NAME
+	value = "blade-pay"
 )
 public interface ITongLianPaymentClient {
 	String API_PREFIX = "/parameters";

blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/ParametersVO.java → blade-service-api/blade-payment-api/src/main/java/org/springblade/pay/tonglianPayment/vo/ParametersVO.java

@@ -14,12 +14,12 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.client.vo;
+package org.springblade.pay.tonglianPayment.vo;
 
-import org.springblade.client.entity.Parameters;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
+import org.springblade.pay.tonglianPayment.entity.Parameters;
 
 /**
  * 支付参数表视图实体类

blade-service/blade-client/pom.xml

@@ -154,6 +154,12 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-payment-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsDescServiceImpl.java

@@ -864,10 +864,20 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 					return R.data(corpsDesc);
 				}
 			} else {
-				return R.data(new CorpsDesc());
+				CorpsDesc corpsDesc1 = new CorpsDesc();
+				R<User> res = userClient.userInfoById(AuthUtil.getUserId());
+				if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())){
+					corpsDesc1.setTel(res.getData().getPhone());
+				}
+				return R.data(corpsDesc1);
 			}
 		} else {
-			return R.data(new CorpsDesc());
+			CorpsDesc corpsDesc1 = new CorpsDesc();
+			R<User> res = userClient.userInfoById(AuthUtil.getUserId());
+			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())){
+				corpsDesc1.setTel(res.getData().getPhone());
+			}
+			return R.data(corpsDesc1);
 		}
 	}
 

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -691,4 +691,15 @@ public class GoodsDescController extends BladeController {
 		List<GoodsDesc> iPage = goodsDescService.list(goodsDescLambdaQueryWrapper);
 		return R.data(iPage);
 	}
+
+	@GetMapping("/descListByCname")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入goodsDesc")
+	public R<?> descListByCname(GoodsDesc goodsDesc) {
+		LambdaQueryWrapper<GoodsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(GoodsDesc::getIsDeleted,0).eq(GoodsDesc::getTenantId,AuthUtil.getTenantId())
+			.like(ObjectUtils.isNotNull(goodsDesc.getCname()),GoodsDesc::getCname,goodsDesc.getCname());
+		List<GoodsDesc> iPage = goodsDescService.list(lambdaQueryWrapper);
+		return R.data(iPage);
+	}
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescPartsController.java

@@ -192,6 +192,9 @@ public class GoodsDescPartsController extends BladeController {
 		if (r.isSuccess() && r.getData().size() > 0) {
 			return R.fail(500, "该产品已有订单禁用失败");
 		}
+		if (ObjectUtils.isNotNull(goodsDesc.getStatus()) && 1 == goodsDesc.getStatus()){
+			goodsDesc.setUpperFrame("1");
+		}
 		boolean status = goodsDescService.updateById(goodsDesc);
 		return R.status(status);
 	}

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

@@ -202,7 +202,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 	 * @return
 	 */
 	@Override
-	public List<GoodsDesc> selectItemsIdGoods(String itemIds){
+	public List<GoodsDesc> selectItemsIdGoods(String itemIds) {
 		List<Long> collect = Arrays.stream(itemIds.split(","))
 			.map(s -> Long.parseLong(s.trim()))
 			.collect(Collectors.toList());
@@ -211,18 +211,18 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 
 	@Override
 	public GoodsDescVO selectGoodsMessage(Long id) {
-		GoodsDescVO goodsDescVO = baseMapper.selectGoodsMessage(id,AuthUtil.getTenantId());
-		if (ObjectUtils.isNotNull(goodsDescVO)){
+		GoodsDescVO goodsDescVO = baseMapper.selectGoodsMessage(id, AuthUtil.getTenantId());
+		if (ObjectUtils.isNotNull(goodsDescVO)) {
 			GoodsType goodsType = goodsTypeService.getById(goodsDescVO.getGoodsTypeId());
-			if (ObjectUtils.isNotNull(goodsType)){
-				goodsDescVO.setGoodsTypeId(goodsType.getId()+"");
+			if (ObjectUtils.isNotNull(goodsType)) {
+				goodsDescVO.setGoodsTypeId(goodsType.getId() + "");
 				goodsDescVO.setGoodsTypeName(goodsType.getCname());
 			}
 			List<GoodsFiles> filesList = goodsFilesMapper.selectList(new LambdaQueryWrapper<GoodsFiles>()
 				.eq(GoodsFiles::getPid, id)
 				.eq(GoodsFiles::getIsDeleted, 0)
 			);
-			if (filesList.size() >0){
+			if (filesList.size() > 0) {
 				goodsDescVO.setUrl(filesList.get(0).getUrl());
 			}
 		}
@@ -685,7 +685,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 
 		List<StockGoods> stockGoodsList = goodsDescDto.getStockGoodsList();
 
-		GoodsDesc goodsDesc = BeanUtil.copy(goodsDescDto,GoodsDesc.class);
+		GoodsDesc goodsDesc = BeanUtil.copy(goodsDescDto, GoodsDesc.class);
 
 		Long id = goodsDescDto.getId();
 		// 代表主表、子表都是新增,
@@ -720,7 +720,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 					k.setPurchasePrice(goodsDesc.getPurchasePrice());
 					k.setStockPrice(goodsDesc.getPurchasePrice());
 					k.setBalanceAmount(k.getBalanceQuantity().multiply(goodsDesc.getPurchasePrice()));
-					if (k.getId() == null){
+					if (k.getId() == null) {
 						k.setTenantId(AuthUtil.getTenantId());
 						k.setGoodsId(goodsDesc.getId());
 						R<StockGoodsVO> r = stockGoodsClient.selectStockParts(null, k.getStorageId(), goodsDesc.getId(), null, null, null, null, null, null);
@@ -728,7 +728,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 							throw new RuntimeException("库存存在重复，请修改原库存");
 						}
 						stockGoodsClient.saveStock(k);
-					}else{
+					} else {
 						k.setUpdateTime(new Date());
 						k.setUpdateUser(SecureUtil.getUserId());
 						stockGoodsClient.updateStock(k);
@@ -744,8 +744,12 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 			goodsDescMapper.updateById(goodsDesc);
 			// 文件列表
 			if (CollectionUtils.isNotEmpty(filesList)) {
+				List<GoodsFiles> goodsFiles = filesList.stream().filter(e -> "0".equals(e.getVersion())).collect(Collectors.toList());
+				if (ObjectUtils.isNotNull(goodsFiles) && goodsFiles.size() > 1) {
+					throw new RuntimeException("附件主图唯一，不允许多个");
+				}
 				int count = 0;
-				for(GoodsFiles k:filesList){
+				for (GoodsFiles k : filesList) {
 					// 新增
 					if (k.getId() == null) {
 						if (count == 0) {
@@ -772,7 +776,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 					k.setPurchasePrice(goodsDesc.getPurchasePrice());
 					k.setStockPrice(goodsDesc.getPurchasePrice());
 					k.setBalanceAmount(k.getBalanceQuantity().multiply(goodsDesc.getPurchasePrice()));
-					if (k.getId() == null){
+					if (k.getId() == null) {
 						k.setTenantId(AuthUtil.getTenantId());
 						k.setGoodsId(goodsDesc.getId());
 						R<StockGoodsVO> r = stockGoodsClient.selectStockParts(null, k.getStorageId(), goodsDesc.getId(), null, null, null, null, null, null);
@@ -780,7 +784,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 							throw new RuntimeException("库存存在重复，请修改原库存");
 						}
 						stockGoodsClient.saveStock(k);
-					}else{
+					} else {
 						k.setUpdateTime(new Date());
 						k.setUpdateUser(SecureUtil.getUserId());
 						stockGoodsClient.updateStock(k);
@@ -806,13 +810,13 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 				if (StringUtil.isBlank(goodsDesc.getCnameInt())) {
 					goodsDesc.setCnameInt(getCnameInt(goodsDesc.getCname()));
 				}
-				if (ObjectUtils.isNotNull(e.getWhether())){
-					if (e.getWhether().equals("是")){
+				if (ObjectUtils.isNotNull(e.getWhether())) {
+					if (e.getWhether().equals("是")) {
 						goodsDesc.setWhether("1");
-					}else if(e.getWhether().equals("否")){
+					} else if (e.getWhether().equals("否")) {
 						goodsDesc.setWhether("0");
 					}
-				}else{
+				} else {
 					goodsDesc.setWhether("0");
 				}
 
@@ -844,16 +848,17 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 					goodsDesc.setUpdateUser(AuthUtil.getUserId());
 					goodsDescMapper.updateById(goodsDesc);
 				}
-			}else{
+			} else {
 				throw new SecurityException("未添加分类或者分类不存在");
 			}
 		});
 		return R.success("ok");
 	}
-   /**
-   * 提取Cname 的 数字
-   * 取出数字作为查询条件
-   */
+
+	/**
+	 * 提取Cname 的 数字
+	 * 取出数字作为查询条件
+	 */
 	private String getCnameInt(String cname) {
 		String regex = "[^0-9]";
 		Pattern p = Pattern.compile(regex);

blade-service/blade-client/src/main/java/org/springblade/client/wechat/controller/WechatController.java

@@ -8,13 +8,13 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
-import org.springblade.client.entity.Parameters;
-import org.springblade.client.tonglianPayment.service.IParametersService;
 import org.springblade.client.wechat.Util.AESUtil;
 import org.springblade.client.wechat.Util.HttpUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.pay.tonglianPayment.entity.Parameters;
+import org.springblade.pay.tonglianPayment.fegin.ITongLianPaymentClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -35,7 +35,7 @@ import java.util.Map;
 @AllArgsConstructor
 public class WechatController {
 
-	private final IParametersService parametersService;
+	private final ITongLianPaymentClient parametersService;
 
 	// 登录凭证校验地址
 	public final static String GetPageAccessTokenUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=APPID&secret=SECRET&js_code=CODE&grant_type=authorization_code";
@@ -66,11 +66,9 @@ public class WechatController {
 		String appIds = "";
 		String appSecrets = "";
 		if (ObjectUtils.isNotNull(applets_id)) {
-			LambdaQueryWrapper<Parameters> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-			lambdaQueryWrapper.eq(Parameters::getIsDeleted,0)
-				.eq(Parameters::getStatus,1)
-				.eq(Parameters::getSubAppid,applets_id);
-			Parameters parameters = parametersService.getOne(lambdaQueryWrapper);
+			Parameters parametersDetails = new Parameters();
+			parametersDetails.setSubAppid(applets_id);
+			Parameters parameters = parametersService.getParametersDetails(parametersDetails);
 			if (ObjectUtils.isNull(parameters)){
 				throw new SecurityException("未找到小程序信息");
 			}

blade-service/blade-client/src/main/java/org/springblade/client/tonglianPayment/controller/ParametersController.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/controller/ParametersController.java

@@ -14,26 +14,26 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.client.tonglianPayment.controller;
+package org.springblade.pay.tonglianPayment.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.client.tonglianPayment.service.IParametersService;
+import org.springblade.core.boot.ctrl.BladeController;
 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.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.pay.tonglianPayment.entity.Parameters;
+import org.springblade.pay.tonglianPayment.service.IParametersService;
+import org.springblade.pay.tonglianPayment.vo.ParametersVO;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.client.entity.Parameters;
-import org.springblade.client.vo.ParametersVO;
-import org.springblade.core.boot.ctrl.BladeController;
+
+import javax.validation.Valid;
 
 /**
  * 支付参数表 控制器

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/controller/TongLianPaymentController.java

@@ -1,7 +1,5 @@
 package org.springblade.pay.tonglianPayment.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -9,19 +7,17 @@ import lombok.AllArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.FeesDesc;
-import org.springblade.client.entity.Parameters;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IFeesDescClient;
 import org.springblade.client.feign.ISerialClient;
-import org.springblade.client.feign.ITongLianPaymentClient;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.finance.dto.ApplyDTO;
 import org.springblade.finance.feign.IFinanceClient;
 import org.springblade.finance.vojo.Settlement;
+import org.springblade.pay.tonglianPayment.entity.Parameters;
 import org.springblade.pay.tonglianPayment.entity.WechatMark;
+import org.springblade.pay.tonglianPayment.fegin.ITongLianPaymentClient;
 import org.springblade.pay.tonglianPayment.method.NotifyServlet;
 import org.springblade.pay.tonglianPayment.service.IPaymentService;
 import org.springblade.pay.tonglianPayment.service.IWechatMarkService;
@@ -35,7 +31,6 @@ import org.springblade.purchase.sales.feign.IOrderItemsClient;
 import org.springblade.stock.entity.StockGoods;
 import org.springblade.stock.feign.IStockGoodsClient;
 import org.springblade.stock.vo.StockGoodsVO;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -130,8 +125,8 @@ public class TongLianPaymentController extends BladeController {
 					order.setSysNo(AnalysisMapUtils.getString("cusorderid", params));
 
 					Parameters parameters = new Parameters();
-					parameters.setAppId(AnalysisMapUtils.getString("cusid", params));
-					parameters.setCusId(AnalysisMapUtils.getString("appid", params));
+					parameters.setAppId(AnalysisMapUtils.getString("appid", params));
+					parameters.setCusId(AnalysisMapUtils.getString("cusid", params));
 					Parameters parametersDetails = tongLianPaymentClient.getParametersDetails(parameters);
 					if (ObjectUtils.isNotNull(parametersDetails)) {
 						wechatMark.setTenantId(parametersDetails.getTenantId());

blade-service/blade-client/src/main/java/org/springblade/client/tonglianPayment/feign/TongLianPaymentClient.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/feign/TongLianPaymentClient.java

@@ -1,14 +1,13 @@
-package org.springblade.client.tonglianPayment.feign;
+package org.springblade.pay.tonglianPayment.feign;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import lombok.AllArgsConstructor;
-import org.springblade.client.entity.Parameters;
-import org.springblade.client.feign.ITongLianPaymentClient;
-import org.springblade.client.tonglianPayment.service.IParametersService;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tenant.annotation.TenantIgnore;
+import org.springblade.pay.tonglianPayment.entity.Parameters;
+import org.springblade.pay.tonglianPayment.fegin.ITongLianPaymentClient;
+import org.springblade.pay.tonglianPayment.service.IParametersService;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 

blade-service/blade-client/src/main/java/org/springblade/client/tonglianPayment/mapper/ParametersMapper.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/mapper/ParametersMapper.java

@@ -14,12 +14,13 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.client.tonglianPayment.mapper;
+package org.springblade.pay.tonglianPayment.mapper;
 
-import org.springblade.client.entity.Parameters;
-import org.springblade.client.vo.ParametersVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.tenant.annotation.TenantIgnore;
+import org.springblade.pay.tonglianPayment.entity.Parameters;
+import org.springblade.pay.tonglianPayment.vo.ParametersVO;
 
 import java.util.List;
 
@@ -40,5 +41,6 @@ public interface ParametersMapper extends BaseMapper<Parameters> {
 	 */
 	List<ParametersVO> selectParametersPage(IPage page, ParametersVO parameters);
 
+	@TenantIgnore
 	Parameters getDetails(Parameters parameters);
 }

blade-service/blade-client/src/main/java/org/springblade/client/tonglianPayment/mapper/ParametersMapper.xml → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/mapper/ParametersMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.client.tonglianPayment.mapper.ParametersMapper">
+<mapper namespace="org.springblade.pay.tonglianPayment.mapper.ParametersMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="parametersResultMap" type="org.springblade.client.entity.Parameters">
+    <resultMap id="parametersResultMap" type="org.springblade.pay.tonglianPayment.entity.Parameters">
         <id column="id" property="id"/>
         <result column="orgid" property="orgid"/>
         <result column="cus_id" property="cusId"/>
@@ -34,11 +34,12 @@
     <select id="selectParametersPage" resultMap="parametersResultMap">
         select * from payment_parameters where is_deleted = 0
     </select>
-    <select id="getDetails" resultType="org.springblade.client.entity.Parameters">
+    <select id="getDetails" resultType="org.springblade.pay.tonglianPayment.entity.Parameters">
         select * from payment_parameters
         where
         is_deleted = 0 and status = #{status}
         <if test="cusId != null and cusId != ''">and cus_id = #{cusId}</if>
+        <if test="subAppid != null and subAppid != ''">and sub_appid = #{subAppid}</if>
         <if test=" appId!= null and  appId!= ''">and app_id = #{appId}</if>
     </select>
 

blade-service/blade-client/src/main/java/org/springblade/client/tonglianPayment/service/IParametersService.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/service/IParametersService.java

@@ -14,13 +14,12 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.client.tonglianPayment.service;
+package org.springblade.pay.tonglianPayment.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.springblade.client.entity.Parameters;
-import org.springblade.client.vo.ParametersVO;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.pay.tonglianPayment.entity.Parameters;
+import org.springblade.pay.tonglianPayment.vo.ParametersVO;
 
 /**
  * 支付参数表 服务类

blade-service/blade-client/src/main/java/org/springblade/client/tonglianPayment/service/impl/ParametersServiceImpl.java → blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/service/impl/ParametersServiceImpl.java

@@ -14,16 +14,16 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.client.tonglianPayment.service.impl;
+package org.springblade.pay.tonglianPayment.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.springblade.client.entity.Parameters;
-import org.springblade.client.tonglianPayment.mapper.ParametersMapper;
-import org.springblade.client.tonglianPayment.service.IParametersService;
-import org.springblade.client.vo.ParametersVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.tenant.annotation.TenantIgnore;
+import org.springblade.pay.tonglianPayment.entity.Parameters;
+import org.springblade.pay.tonglianPayment.mapper.ParametersMapper;
+import org.springblade.pay.tonglianPayment.service.IParametersService;
+import org.springblade.pay.tonglianPayment.vo.ParametersVO;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  * 支付参数表 服务实现类
@@ -40,6 +40,7 @@ public class ParametersServiceImpl extends ServiceImpl<ParametersMapper, Paramet
 	}
 
 	@Override
+	@TenantIgnore
 	public Parameters getDetails(Parameters parameters) {
 		return baseMapper.getDetails(parameters);
 	}

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/service/impl/PaymentServiceImpl.java

@@ -4,11 +4,11 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.GoodsDesc;
-import org.springblade.client.entity.Parameters;
 import org.springblade.client.feign.IGoodsDescClient;
-import org.springblade.client.feign.ITongLianPaymentClient;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.pay.tonglianPayment.entity.Parameters;
+import org.springblade.pay.tonglianPayment.fegin.ITongLianPaymentClient;
 import org.springblade.pay.tonglianPayment.utils.AnalysisMapUtils;
 import org.springblade.pay.tonglianPayment.utils.SybPayService;
 import org.springblade.pay.tonglianPayment.service.IPaymentService;

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/feign/OrderDescClient.java

@@ -249,7 +249,11 @@ public class OrderDescClient implements IOrderDescClient {
 		if (ObjectUtils.isNull(order)) {
 			throw new SecurityException("未查到订单信息");
 		}
-		order.setStatus(11);
+		if (ObjectUtils.isNotNull(order.getCourierNumber())){
+			order.setStatus(4);
+		}else{
+			order.setStatus(3);
+		}
 		iOrderService.updateById(order);
 		selectOrder.setStatus(11);
 		iOrderService.updateById(selectOrder);
@@ -400,7 +404,7 @@ public class OrderDescClient implements IOrderDescClient {
 		} else {
 			//微信退款
 			PaymentDTO paymentDTO = new PaymentDTO();
-			paymentDTO.setTrxamt(order.getDebitAmount().multiply(new BigDecimal(100)).intValue());
+			paymentDTO.setTrxamt(order.getDebitAmount().intValue());
 			paymentDTO.setReqsn(selectOrder.getSysNo());
 			paymentDTO.setOldreqsn(order.getSysNo());
 			paymentDTO.setOldtrxid(order.getOldTrxId());

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

@@ -54,7 +54,9 @@ import org.springblade.finance.vojo.Settlement;
 import org.springblade.land.entity.LandOrder;
 import org.springblade.land.feign.ILandClient;
 import org.springblade.pay.tonglianPayment.dto.PaymentDTO;
+import org.springblade.pay.tonglianPayment.entity.Parameters;
 import org.springblade.pay.tonglianPayment.fegin.IPaymentClient;
+import org.springblade.pay.tonglianPayment.fegin.ITongLianPaymentClient;
 import org.springblade.purchase.sales.entity.*;
 import org.springblade.purchase.sales.enums.OrderStatusEnum;
 import org.springblade.purchase.sales.excel.*;
@@ -65,7 +67,6 @@ import org.springblade.purchase.sales.vo.*;
 import org.springblade.stock.entity.StockGoods;
 import org.springblade.stock.feign.IStockGoodsClient;
 import org.springblade.stock.vo.StockGoodsVO;
-import org.springblade.system.cache.ParamCache;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.entity.Tenant;
 import org.springblade.system.feign.IDictBizClient;
@@ -2387,7 +2388,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	public Order getOrderMessageParts(Order order) {
 		// 获取订单主表信息
 		Order orderMessage = baseMapper.selectById(order.getId());
-		if (0 == orderMessage.getStatus() && !"1".equals(order.getSource())){
+		if (0 == orderMessage.getStatus() && !"1".equals(order.getSource())) {
 			orderMessage.setStatus(orderMessage.getActualPaymentStatus());
 		}
 		if (ObjectUtils.isNotNull(orderMessage.getSalesName())) {
@@ -4925,7 +4926,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			throw new RuntimeException("未找到订单信息，订单已取消");
 		}
 
-		if (orderInfo.getActualPaymentStatus() > 0) {
+		if (orderInfo.getActualPaymentStatus() > 1) {
 			throw new RuntimeException("订单已支付，请不要重复操作");
 		}
 
@@ -4959,7 +4960,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 			}
 			PaymentDTO paymentDTO = new PaymentDTO();
-			paymentDTO.setTrxamt(orderInfo.getDebitAmount().multiply(new BigDecimal(100)).intValue());
+			paymentDTO.setTrxamt(orderInfo.getDebitAmount().intValue());
 			paymentDTO.setReqsn(orderInfo.getSysNo());
 			paymentDTO.setPaytype(parameters.getPayType());
 			paymentDTO.setBody(body);
@@ -5641,6 +5642,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		//查询字典所有状态
 		R<List<DictBiz>> res = dictBizClient.getList("order_status_pjjl");
 		if (res.isSuccess() && res.getData().size() > 0) {
+			Long corpId = null;
+			if (AuthUtil.getUserRole().equals("客户")) {
+				CorpsAttn corpsAttn = corpsAttnClient.getUser(AuthUtil.getUserId());
+				if (ObjectUtils.isNotNull(corpsAttn)) {
+					CorpsDesc corpsDesc = corpsDescClient.getCorpId(corpsAttn.getPid());
+					if (ObjectUtils.isNotNull(corpsDesc)) {
+						corpId = corpsDesc.getId();
+					}
+				}
+			}
 			//循环赋值
 			List<DictBiz> list = res.getData().stream().filter(e -> Integer.parseInt(e.getDictKey()) >= 7).collect(Collectors.toList());
 			for (DictBiz dictBiz : res.getData()) {
@@ -5651,10 +5662,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				if ("13".equals(dictBiz.getDictKey())) {
 					int count = baseMapper.selectCount(new LambdaQueryWrapper<Order>().eq(Order::getIsDeleted, 0)
 						.eq(Order::getTenantId, AuthUtil.getTenantId())
+						.eq(ObjectUtils.isNotNull(corpId), Order::getCorpId, corpId)
 						.in(Order::getStatus, list.stream().map(DictBiz::getDictKey).collect(Collectors.toList())));
 					map.put("count", count);
 				} else {
-					map.put("count", count(Integer.parseInt(dictBiz.getDictKey())));
+					map.put("count", count(Integer.parseInt(dictBiz.getDictKey()), corpId));
 				}
 				mapList.add(map);
 			}
@@ -5789,7 +5801,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 * 销售或采购订单表
 	 */
 	@Override
-	public IPage<Order> selectList(Query query, LambdaQueryWrapper<Order> lambdaQueryWrapper,String source) {
+	public IPage<Order> selectList(Query query, LambdaQueryWrapper<Order> lambdaQueryWrapper, String source) {
 
 		IPage<Order> page = baseMapper.selectPage(Condition.getPage(query), lambdaQueryWrapper);
 		StringBuilder corpIds = new StringBuilder();//客户拼接
@@ -5816,12 +5828,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		List<User> users = userClient.selectUserIds(salesNames.toString());
 		if (CollectionUtils.isNotEmpty(page.getRecords())) {
 			page.getRecords().forEach(item -> {
+				item.setOrderItemsList(new ArrayList<>());
 				if (item.getBalanceAmount().equals(new BigDecimal(0))) {
 					item.setCollection("已收款");
 				} else {
 					item.setCollection("未收款");
 				}
-				if (0 == item.getStatus() && !"1".equals(source)){
+				if (0 == item.getStatus() && !"1".equals(source)) {
 					item.setStatus(item.getActualPaymentStatus());
 				}
 				Acc acc = financeClient.selectBySrcId(item.getId());
@@ -6046,7 +6059,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			//入库出库数量
 			order.setStorageQuantity(order.getOrderItemsList().stream().map(OrderItems::getStorageInQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 			//商品名称集合
-			order.setGoodsList(order.getOrderItemsList().stream().map(OrderItems::getGoodsName).distinct().collect(Collectors.joining()));
+			//商品名称集合
+			List<GoodsDesc> goodsDescList = goodsDescClient.selectItemsIdGoods(order.getOrderItemsList().stream().map(OrderItems::getGoodsName).distinct().collect(Collectors.joining()));
+			if (ObjectUtils.isNotNull(goodsDescList) && goodsDescList.size() > 0) {
+				order.setGoodsList(goodsDescList.stream().map(GoodsDesc::getCname).distinct().collect(Collectors.joining()));
+			}
 		}
 		if (ObjectUtils.isNull(order.getThisUsedProfit())) {
 			order.setThisUsedProfit(new BigDecimal("0"));
@@ -6232,7 +6249,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			//入库出库数量
 			order.setStorageQuantity(order.getOrderItemsList().stream().map(OrderItems::getStorageInQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 			//商品名称集合
-			order.setGoodsList(order.getOrderItemsList().stream().map(OrderItems::getGoodsName).distinct().collect(Collectors.joining()));
+			List<GoodsDesc> goodsDescList = goodsDescClient.selectItemsIdGoods(order.getOrderItemsList().stream().map(OrderItems::getGoodsName).distinct().collect(Collectors.joining()));
+			if (ObjectUtils.isNotNull(goodsDescList) && goodsDescList.size() > 0) {
+				order.setGoodsList(goodsDescList.stream().map(GoodsDesc::getCname).distinct().collect(Collectors.joining()));
+			}
 		}
 		if (ObjectUtils.isNull(order.getThisUsedProfit())) {
 			order.setThisUsedProfit(new BigDecimal("0"));
@@ -6311,8 +6331,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 * <p>
 	 * status  状态值
 	 */
-	public int count(int status) {
-		return baseMapper.selectCount(new LambdaQueryWrapper<Order>().eq(Order::getIsDeleted, 0).eq(Order::getTenantId, AuthUtil.getTenantId()).eq(Order::getStatus, status));
+	public int count(int status, Long corpId) {
+		return baseMapper.selectCount(new LambdaQueryWrapper<Order>()
+			.eq(Order::getIsDeleted, 0)
+			.eq(Order::getTenantId, AuthUtil.getTenantId())
+			.eq(ObjectUtils.isNotNull(corpId), Order::getCorpId, corpId)
+			.eq(Order::getStatus, status));
 	}
 
 	@Override

blade-service/blade-stock/src/main/java/org/springblade/stock/controller/StockGoodsController.java

@@ -56,7 +56,6 @@ import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.BeanUtils;
-import org.springframework.http.HttpRequest;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -331,6 +330,17 @@ public class StockGoodsController extends BladeController {
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		if (ObjectUtils.isNotNull(ids)) {
+			String[] arrs = ids.split(",");
+			for (String arr : arrs) {
+				StockGoods stockGoods = stockGoodsService.getById(Long.parseLong(arr));
+				if (ObjectUtils.isNotNull(stockGoods)){
+					if (ObjectUtils.isNotNull(stockGoods.getInQuantity()) || ObjectUtils.isNotNull(stockGoods.getOutQuantity())){
+						throw new RuntimeException("删除失败，该库存已有单据信息");
+					}
+				}
+			}
+		}
 		return R.status(stockGoodsService.removeByIds(Func.toLongList(ids)));
 	}
 
@@ -418,10 +428,10 @@ public class StockGoodsController extends BladeController {
 	 * 自定义分页 手机端库存(新-配件)
 	 */
 	@GetMapping("/app-stockPartsPage")
-	public R<IPage<AppStockPartsVO>> stockPartsPage(HttpServletRequest request , AppStockPartsVO appStockPartsVO, Query query) {
+	public R<IPage<AppStockPartsVO>> stockPartsPage(HttpServletRequest request, AppStockPartsVO appStockPartsVO, Query query) {
 
-		System.out.println("Blade-Auth="+request.getHeader("Blade-Auth"));
-		if (ObjectUtils.isNull(request.getHeader("Blade-Auth"))){
+		System.out.println("Blade-Auth=" + request.getHeader("Blade-Auth"));
+		if (ObjectUtils.isNull(request.getHeader("Blade-Auth"))) {
 			// 获取租户信息
 			R<Tenant> tenant = sysClient.getTenantByAppId(request.getHeader("appId"));
 //			R<Tenant> tenant = sysClient.getTenantByAppId("wx64d1f6c9aa9c92e6");
@@ -430,7 +440,7 @@ public class StockGoodsController extends BladeController {
 			} else {
 				throw new RuntimeException("获取数据失败");
 			}
-		}else{
+		} else {
 			appStockPartsVO.setTenantId(AuthUtil.getTenantId());
 		}
 		if (appStockPartsVO.getLabel() != null && appStockPartsVO.getLabel().length > 0) {
@@ -452,7 +462,7 @@ public class StockGoodsController extends BladeController {
 						shoppingMall = corpsDesc.getShoppingMall();
 					}
 				}
-			}else{
+			} else {
 				shoppingMall = "游客";
 			}
 			String finalShoppingMall = shoppingMall;
@@ -540,7 +550,7 @@ public class StockGoodsController extends BladeController {
 				if (ObjectUtils.isNotNull(goodsMessage.getData().getLabel()) && goodsMessage.getData().getLabel().contains("特价")) {
 					appStockPartsVO1.setSalesPrice(goodsMessage.getData().getSpecialOffer());
 					appStockPartsVO1.setStandardPrice(goodsMessage.getData().getStandardPrice());
-				}else{
+				} else {
 					if ("零售价1".equals(finalShoppingMall)) {
 						appStockPartsVO1.setSalesPrice(goodsMessage.getData().getStandardPrice());
 					} else if ("零售价2".equals(finalShoppingMall)) {

blade-service/blade-stock/src/main/java/org/springblade/stock/mapper/StockGoodsMapper.xml

@@ -161,6 +161,7 @@
         AND t5.version = '0' and t5.is_deleted = 0
         <where>
             t1.is_deleted = 0
+            and t3.status = 0
             and t1.tenant_id = #{stock.tenantId}
             <if test="stock.goods != null and stock.goods != ''">
                 and (t3.cname like concat('%', #{stock.goods}, '%') or t3.cname_int like concat('%', #{stock.goods}, '%') or t3.code like concat('%', #{stock.goods}, '%'))
@@ -342,9 +343,10 @@
         LEFT JOIN basic_goods_desc t3 ON t1.goods_id = t3.id
         LEFT JOIN basic_goods_type t4 ON t3.goods_type_id = t4.id
         LEFT JOIN basic_goods_files t5 ON t3.id = t5.pid
-        AND t5.version = '0'
+        AND t5.version = '0' and t5.is_deleted = 0
         <where>
             t1.is_deleted = 0
+            and t3.status = 0
             and t1.tenant_id = #{stock.tenantId}
             and t1.surplus_route_quantity IS NOT NULL
             <if test="stock.id != null">