Merge branch 'dev' into 'mp-server-test'

生成盲票详情小程序码

See merge request quanshu/mp-server!711

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserShareController.java

@@ -8,6 +8,7 @@ import com.qs.mp.user.domain.vo.UserShareVO;
 import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -16,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Objects;
+
 /**
  * @auther zhongcp
  * @create 2022-02-28 16:17:48
@@ -43,7 +46,7 @@ public class UserShareController extends BaseApiController {
 		String boxId = jsonObject.getString("boxId"); // 票组ID
 		String type = jsonObject.getString("type"); // 分享类型，1/2
 		Long userId = SecurityUtils.getUserId();
-		if (UserShareVO.SHARE_TYPE_SITE.equals(type)) {
+		if (UserShareVO.SHARE_TYPE_SITE.equals(type) && StringUtils.isBlank(boxId)) {
 			// 经销商分享，默认到盲票小程序首页
 			String rst = wxUrlLinkService.generateUnlimitCode("", userId + "&" + type, userAppId);
 			return new AjaxResult(Type.SUCCESS, "", rst);

mp-service/src/main/java/com/qs/mp/admin/domain/TicketBox.java

@@ -12,6 +12,7 @@ import com.qs.mp.common.enums.TicketBoxStatusEnum;
 import com.qs.mp.common.enums.TicketTypeEnum;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;
 import java.util.Objects;
 
@@ -239,4 +240,13 @@ public class TicketBox implements Serializable {
     return 0;
   }
 
+  @ApiModelProperty("分佣金额")
+  public BigDecimal saleCommPrice() {
+    if (Objects.isNull(this.saleCommRate) || Objects.isNull(this.salePrice)) {
+      return BigDecimal.ZERO;
+    }
+
+    return this.saleCommRate.multiply(new BigDecimal(this.salePrice)).divide(new BigDecimal(100),2, RoundingMode.HALF_UP);
+  }
+
 }

mp-service/src/main/java/com/qs/mp/admin/domain/vo/TicketBoxListVO.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.qs.mp.admin.domain.TicketBox;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;
+import java.util.Objects;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -113,4 +115,13 @@ public class TicketBoxListVO {
    */
   @ApiModelProperty("上架时间")
   private Date onTime;
+
+  @ApiModelProperty("分佣金额")
+  public BigDecimal saleCommPrice() {
+    if (Objects.isNull(this.saleCommRate) || Objects.isNull(this.salePrice)) {
+      return BigDecimal.ZERO;
+    }
+
+    return this.saleCommRate.multiply(new BigDecimal(this.salePrice)).divide(new BigDecimal(100),2, RoundingMode.HALF_UP);
+  }
 }