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

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

@@ -675,4 +675,7 @@ public class Order implements Serializable {
 
 	@ApiModelProperty(value = "发票金额")
 	private BigDecimal invoiceAmount;
+	@ApiModelProperty(value = "特价占比")
+	private BigDecimal specialOfferOf;
+
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java

@@ -101,7 +101,10 @@ public class Tenant extends BaseEntity {
 	 */
 	@ApiModelProperty(value = "授权码")
 	private String licenseKey;
-
+	/**
+	 * 租户类型
+	 */
+	@ApiModelProperty(value = "租户类型")
 	private Integer billType;
 
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ITenantClient.java

@@ -0,0 +1,24 @@
+package org.springblade.system.feign;
+
+import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.system.entity.Tenant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(
+	value = AppConstant.APPLICATION_SYSTEM_NAME,
+	fallback = ITenantClientFallback.class
+)
+public interface ITenantClient {
+	String API_PREFIX = "/client";
+	String TENANT_MESSAGE = API_PREFIX + "/tenantMessage";
+
+	/**
+	 * 根据租户id获取租户信息
+	 * @param tenantId
+	 * @return
+	 */
+	@GetMapping(TENANT_MESSAGE)
+	Tenant tenantMessage(@RequestParam("tenantId") String tenantId);
+}

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ITenantClientFallback.java

@@ -0,0 +1,18 @@
+package org.springblade.system.feign;
+
+import org.springblade.core.tool.api.R;
+import org.springblade.system.entity.Tenant;
+import org.springframework.stereotype.Component;
+
+/**
+ * Feign失败配置
+ *
+ * @author Chill
+ */
+@Component
+public class ITenantClientFallback implements ITenantClient{
+	@Override
+	public Tenant tenantMessage(String tenantId) {
+		return null;
+	}
+}

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/UserVO.java

@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.system.user.entity.User;
@@ -81,4 +82,9 @@ public class UserVO extends User {
 	 * 拓展信息
 	 */
 	private String userExt;
+	/**
+	 * 租户类型
+	 */
+	@ApiModelProperty(value = "租户类型")
+	private Integer billType;
 }

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

@@ -594,5 +594,7 @@ public class Order extends OrderBase {
 	@ApiModelProperty(value = "已收重量")
 	@TableField(exist = false)
 	private BigDecimal actualWeight;
+	@ApiModelProperty(value = "特价占比")
+	private BigDecimal specialOfferOf;
 
 }

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

@@ -99,6 +99,7 @@
         <result column="sell_pricing_remarks" property="sellPricingRemarks"/>
         <result column="production_plant" property="productionPlant"/>
         <result column="coefficient" property="coefficient"/>
+        <result column="special_offer_of" property="specialOfferOf"/>
     </resultMap>
 
 

blade-service/blade-system/src/main/java/org/springblade/system/feign/TenantClient.java

@@ -0,0 +1,34 @@
+package org.springblade.system.feign;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.system.entity.Tenant;
+import org.springblade.system.service.ITenantService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 系统服务Feign实现类
+ *
+ * @author Chill
+ */
+@NonDS
+@ApiIgnore
+@RestController
+@AllArgsConstructor
+public class TenantClient implements ITenantClient{
+
+	private final ITenantService tenantService;
+	/**
+	 * 根据租户id获取租户信息
+	 * @param tenantId
+	 * @return
+	 */
+	@Override
+	@GetMapping(TENANT_MESSAGE)
+	public Tenant tenantMessage(String tenantId) {
+		return tenantService.getOne(new QueryWrapper<Tenant>().eq("tenant_id",tenantId).eq("is_deleted",0));
+	}
+}

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -38,6 +38,8 @@ import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.StringPool;
+import org.springblade.system.entity.Tenant;
+import org.springblade.system.feign.ITenantClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.excel.UserExcel;
 import org.springblade.system.user.excel.UserImporter;
@@ -68,6 +70,7 @@ import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
 public class UserController {
 
 	private final IUserService userService;
+	private final ITenantClient tenantClient;
 
 	/**
 	 * 查询单条
@@ -89,7 +92,12 @@ public class UserController {
 	@GetMapping("/info")
 	public R<UserVO> info(BladeUser user) {
 		User detail = userService.getById(user.getUserId());
-		return R.data(UserWrapper.build().entityVO(detail));
+		UserVO userVO = UserWrapper.build().entityVO(detail);
+		Tenant tenant = tenantClient.tenantMessage(userVO.getTenantId());
+		if (tenant != null){
+			userVO.setBillType(tenant.getBillType());
+		}
+		return R.data(userVO);
 	}
 
 	/**

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

@@ -97,6 +97,7 @@
         <result column="if_shipping" property="ifShipping"/>
         <result column="purchase_pricing_remarks" property="purchasePricingRemarks"/>
         <result column="sell_pricing_remarks" property="sellPricingRemarks"/>
+        <result column="special_offer_of" property="specialOfferOf"/>
     </resultMap>