refactor: 提交合作伙伴部分代码

jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -209,9 +209,9 @@ public class ShiroConfig {
     //update-end---author:chenrui ---date:20240126  for：【QQYUN-7932】AI助手------------
 
     @Bean("securityManager")
-    public DefaultWebSecurityManager securityManager(ShiroRealm myRealm) {
+    public DefaultWebSecurityManager securityManager(ShiroRealm myRealm,PartnerShiroRealm partnerShiroRealm) {
         DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager();
-        securityManager.setRealm(myRealm);
+        securityManager.setRealms(Arrays.asList(myRealm,partnerShiroRealm));
 
         /*
          * 关闭shiro自带的session，详情见文档

jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java

@@ -82,9 +82,9 @@ public class JwtFilter extends BasicHttpAuthenticationFilter {
         }  else {
             authenticationToken = new JwtToken(token);
         }
-        JwtToken jwtToken = new JwtToken(token);
+
         // 提交给realm进行登入，如果错误他会抛出异常并被捕获
-        getSubject(request, response).login(jwtToken);
+        getSubject(request, response).login(authenticationToken);
         // 如果没有抛出异常则代表登入成功，返回true
         return true;
     }

jeecg-module-system/jeecg-shop/src/main/java/org/jeecg/modules/shop/captcha/controller/CaptchaController.java

@@ -19,7 +19,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Slf4j
-@Api(tags = "验证码服务")
+@Api(tags = "合作伙伴-验证码服务")
 @RestController
 @RequestMapping("/captcha")
 @RequiredArgsConstructor
@@ -29,7 +29,7 @@ public class CaptchaController {
     
     @IgnoreAuth
     @PostMapping("/sms/send")
-    @ApiOperation(value = "发送短信验证码", notes = "发送短信验证码")
+    @ApiOperation(value = "发送短信验证码  type = partner_login", notes = "发送短信验证码 type = partner_login")
     public Result<?> sendSmsCaptcha(@RequestBody @Valid SendSmsCaptchaDTO dto) {
         service.sendSmsCaptcha(dto);
         return Result.OK();

jeecg-module-system/jeecg-shop/src/main/java/org/jeecg/modules/shop/commission/entity/PartnerCommission.java

@@ -89,4 +89,7 @@ public class PartnerCommission implements Serializable {
 
     @ApiModelProperty(value = "金额")
     private BigDecimal money;
+
+    @ApiModelProperty(value = "0未发放 1已发放")
+    private Integer showState;
 }

jeecg-module-system/jeecg-shop/src/main/java/org/jeecg/modules/shop/commission/entity/vo/PartnerCommissionVO.java

@@ -90,4 +90,7 @@ public class PartnerCommissionVO implements Serializable {
 
     @ApiModelProperty(value = "客户名称")
     private String customerName;
+
+    @ApiModelProperty(value = "0未发放 1已发放")
+    private Integer showState;
 }

jeecg-module-system/jeecg-shop/src/main/java/org/jeecg/modules/shop/commission/mapper/xml/PartnerCommissionMapper.xml

@@ -18,7 +18,7 @@ select a.*,b.name as customerName
     </select>
     <select id="getCommissionByUserAndYear" resultType="java.math.BigDecimal">
         SELECT
-            SUM(money) AS totalCommission
+            ifnull(SUM(money),0) AS totalCommission
         FROM partner_customer as a
             inner join partner_commission as b on a.id = b.customer_id
         where a.user_id = #{userId}
@@ -28,7 +28,7 @@ select a.*,b.name as customerName
     </select>
     <select id="getOrderCommissionByUserAndYear" resultType="java.math.BigDecimal">
         SELECT
-            SUM(money) AS totalCommission
+            ifnull(SUM(money),0) AS totalCommission
         FROM partner_customer as a
                  inner join partner_commission as b on a.id = b.customer_id
         where a.user_id = #{userId}

jeecg-module-system/jeecg-shop/src/main/java/org/jeecg/modules/shop/customer/controller/PartnerCustomerController.java

@@ -41,7 +41,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  * @Date:   2025-07-11
  * @Version: V1.0
  */
-@Api(tags="[合作伙伴-客户]客户接口")
+@Api(tags="合作伙伴-客户接口")
 @RestController
 @RequestMapping("/partner/partnerCustomer")
 @Slf4j
@@ -80,9 +80,7 @@ public class PartnerCustomerController extends JeecgController<PartnerCustomer,
 	 * @param partnerCustomer
 	 * @return
 	 */
-	@AutoLog(value = "partner_customer-添加")
 	@ApiOperation(value="partner_customer-添加", notes="partner_customer-添加")
-	@RequiresPermissions("partnercustomer:partner_customer:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody PartnerCustomerDTO partnerCustomer) {
 		partnerCustomerService.addCustomer(partnerCustomer);
@@ -95,9 +93,7 @@ public class PartnerCustomerController extends JeecgController<PartnerCustomer,
 	 * @param dto
 	 * @return
 	 */
-	@AutoLog(value = "partner_customer-编辑")
 	@ApiOperation(value="partner_customer-编辑", notes="partner_customer-编辑")
-	@RequiresPermissions("partnercustomer:partner_customer:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody PartnerCustomerDTO dto) {
 		partnerCustomerService.updatecustomer(dto);

jeecg-module-system/jeecg-shop/src/main/java/org/jeecg/modules/shop/customer/entity/PartnerCustomerLinkman.java

@@ -68,4 +68,7 @@ public class PartnerCustomerLinkman implements Serializable {
 	/**手机号*/
     @ApiModelProperty(value = "手机号")
     private String phone;
+
+    @ApiModelProperty(value = "全名")
+    private String fullName;
 }

jeecg-module-system/jeecg-shop/src/main/java/org/jeecg/modules/shop/customer/entity/query/CustomerQuery.java

@@ -0,0 +1,33 @@
+package org.jeecg.modules.shop.customer.entity.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.modules.shop.customer.entity.PartnerCustomerLinkman;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description: partner_customer
+ * @Author: jeecg-boot
+ * @Date:   2025-07-11
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="", description="")
+public class CustomerQuery implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+    @ApiModelProperty(value = "中台线索状态")
+    private String clewState;
+    @ApiModelProperty(value = "佣金状态0未发放 1已发放")
+    private String commissionState;
+
+}

jeecg-module-system/jeecg-shop/src/main/java/org/jeecg/modules/shop/customer/entity/vo/PartnerCustomerVO.java

@@ -0,0 +1,60 @@
+package org.jeecg.modules.shop.customer.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description: partner_customer
+ * @Author: jeecg-boot
+ * @Date:   2025-07-11
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="partner_customer对象", description="partner_customer")
+public class PartnerCustomerVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+
+	/**姓名*/
+    @ApiModelProperty(value = "姓名")
+    private String name;
+	/**客户类型*/
+    @ApiModelProperty(value = "中台线索编号")
+    private String clewCode;
+	/**国家*/
+    @ApiModelProperty(value = "国家")
+    private String country;
+	/**业务类型*/
+    @ApiModelProperty(value = "中台线索状态")
+    private String clewState;
+	/**公司名*/
+    @ApiModelProperty(value = "佣金")
+    private BigDecimal commission;
+	/**公司网址*/
+    @ApiModelProperty(value = "佣金状态0未发放 1已发放")
+    private String commissionState;
+
+    /**创建时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+}

jeecg-module-system/jeecg-shop/src/main/java/org/jeecg/modules/shop/customer/service/impl/PartnerCustomerServiceImpl.java

@@ -54,7 +54,8 @@ public class PartnerCustomerServiceImpl extends ServiceImpl<PartnerCustomerMappe
         this.save( cu);
         if (CollectionUtil.isNotEmpty(dto.getLinkmanList())){
             dto.getLinkmanList().forEach(linkman -> {
-                linkman.setId(String.valueOf(IdWorker.getId()));
+                linkman.setCustomerId(cu.getId());
+                linkman.setFullName(linkman.getFirstName()+ linkman.getLastName());
             });
             linkmanService.saveBatch(dto.getLinkmanList());
         }

jeecg-module-system/jeecg-shop/src/main/java/org/jeecg/modules/shop/user/controller/PartnerUserCenterController.java

@@ -30,7 +30,7 @@ import javax.validation.Valid;
 * @Date:   2025-07-09
 * @Version: V1.0
 */
-@Api(tags="[合作伙伴前台]-合作伙伴前台工作台接口")
+@Api(tags="合作伙伴-合作伙伴工作台接口")
 @RestController
 @RequestMapping("/partner/userCenter")
 @Slf4j

jeecg-module-system/jeecg-shop/src/main/java/org/jeecg/modules/shop/user/controller/PartnerUserController.java

@@ -51,7 +51,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  * @Date:   2025-07-09
  * @Version: V1.0
  */
-@Api(tags="[合作伙伴前台]-合作伙伴前台用户接口")
+@Api(tags="合作伙伴-合作伙伴用户接口")
 @RestController
 @RequestMapping("/partner/partnerUser")
 @Slf4j

jeecg-module-system/jeecg-shop/src/main/java/org/jeecg/modules/shop/user/entity/dto/UserInfoDTO.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 @Data
@@ -46,7 +47,7 @@ public class UserInfoDTO {
     private String promoteBusiness;
 
     /**0paypal 1bank*/
-    @NotBlank(message = "payMethod is not null")
+    @NotNull(message = "payMethod is not null")
     @ApiModelProperty(value = "0paypal 1bank")
     private Integer payMethod;
     /**paypal email*/
@@ -77,13 +78,13 @@ public class UserInfoDTO {
     @ApiModelProperty(value = "Position类型为公司时填写")
     private String position;
     /**Date of Incorporation类型为公司时填写*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd ")
     @ApiModelProperty(value = "Date of Incorporation类型为公司时填写")
     private Date dateOfIncorporation;
     /**Company Size类型为公司时填写*/
     @ApiModelProperty(value = "Company Size类型为公司时填写")
-    private String ompanySize;
+    private String companySize;
     /**Business type类型为公司时填写*/
     @ApiModelProperty(value = "Business type类型为公司时填写")
     private String businessType;