Просмотр исходного кода

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
winter 1 год назад
Родитель
Сommit
f5030139c1
6 измененных файлов: 22 добавлений и 22 удалений
  1. +6
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivity.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/LegionActivityMerchantStatistics.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/LegionActivitySellOrder.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java
  5. +6
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java
  6. +6
    -6
      mallinkService/src/main/resources/mapper/WxLegionActivityMapper.xml

+ 6
- 6
mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivity.java Просмотреть файл

@@ -56,42 +56,42 @@ public class WxLegionActivity extends TenantEntity {
*/
@io.swagger.annotations.ApiModelProperty(value="售卡积分",name="sellingCard")
@TableField(value = "selling_card")
private Integer sellingCard;
private Double sellingCard;

/**
* 签单积分
*/
@io.swagger.annotations.ApiModelProperty(value="签单积分",name="signOrder")
@TableField(value = "sign_order")
private Integer signOrder;
private Double signOrder;

/**
* 外部军团带单
*/
@io.swagger.annotations.ApiModelProperty(value="外部军团带单",name="difLegionOrder")
@TableField(value = "dif_legion_order")
private Integer difLegionOrder;
private Double difLegionOrder;

/**
* 内部军团不同联盟带单
*/
@io.swagger.annotations.ApiModelProperty(value="内部军团不同联盟带单",name="difUnionOrder")
@TableField(value = "dif_union_order")
private Integer difUnionOrder;
private Double difUnionOrder;

/**
* 内部军团相同联盟带单
*/
@io.swagger.annotations.ApiModelProperty(value="内部军团相同联盟带单",name="eqUnionOrder")
@TableField(value = "eq_union_order")
private Integer eqUnionOrder;
private Double eqUnionOrder;

/**
* 内部军团无联盟带单
*/
@io.swagger.annotations.ApiModelProperty(value="内部军团无联盟带单",name="notUnionOrder")
@TableField(value = "not_union_order")
private Integer notUnionOrder;
private Double notUnionOrder;

/**
* 状态


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/vo/LegionActivityMerchantStatistics.java Просмотреть файл

@@ -29,5 +29,5 @@ public class LegionActivityMerchantStatistics implements Serializable {
@Excel(name="原军团内部带单",width = 20,orderNum = "8")
private Integer eqUnion;
@Excel(name="得分",width = 20,orderNum = "9")
private Integer totalScore;
private Double totalScore;
}

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/vo/LegionActivitySellOrder.java Просмотреть файл

@@ -56,5 +56,5 @@ public class LegionActivitySellOrder implements Serializable {
private Date orderCreateDate;

@Excel(name = "带单积分", width = 20, orderNum = "16")
private Integer score;
private Double score;
}

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java Просмотреть файл

@@ -349,7 +349,7 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe
result.put("eqUnion",eq_union);
result.put("difUnion",dif_union+not_union);

Integer total_score = userCount*activity.getSellingCard()+order_count*activity.getSignOrder()
Double total_score = userCount*activity.getSellingCard()+order_count*activity.getSignOrder()
+dif_legion*activity.getDifLegionOrder()+dif_union*activity.getDifUnionOrder()
+eq_union*activity.getEqUnionOrder()+not_union*activity.getNotUnionOrder();
result.put("totalScore",total_score);
@@ -419,7 +419,7 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe
merchantS.setEqUnion(eq_union);
merchantS.setDifUnion(dif_union+not_union);

Integer total_score = userCount*activity.getSellingCard()+order_count*activity.getSignOrder()
Double total_score = userCount*activity.getSellingCard()+order_count*activity.getSignOrder()
+dif_legion*activity.getDifLegionOrder()+dif_union*activity.getDifUnionOrder()
+eq_union*activity.getEqUnionOrder()+not_union*activity.getNotUnionOrder();
merchantS.setTotalScore(total_score);


+ 6
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java Просмотреть файл

@@ -147,22 +147,22 @@ public class WxLegionActivityServiceImpl implements WxLegionActivityService{
public void saveOrUpdate(WxLegionActivity wxLegionActivity) {
Date now = new Date();
if(wxLegionActivity.getSellingCard() == null){
wxLegionActivity.setSellingCard(0);
wxLegionActivity.setSellingCard(0d);
}
if(wxLegionActivity.getSignOrder() == null){
wxLegionActivity.setSignOrder(0);
wxLegionActivity.setSignOrder(0d);
}
if(wxLegionActivity.getDifLegionOrder() == null){
wxLegionActivity.setDifLegionOrder(0);
wxLegionActivity.setDifLegionOrder(0d);
}
if(wxLegionActivity.getDifUnionOrder() == null){
wxLegionActivity.setDifUnionOrder(0);
wxLegionActivity.setDifUnionOrder(0d);
}
if(wxLegionActivity.getEqUnionOrder() == null){
wxLegionActivity.setEqUnionOrder(0);
wxLegionActivity.setEqUnionOrder(0d);
}
if(wxLegionActivity.getNotUnionOrder() == null){
wxLegionActivity.setNotUnionOrder(0);
wxLegionActivity.setNotUnionOrder(0d);
}
if(wxLegionActivity.getId() == null){
final IdWorker idWorker = IdWorker.get();


+ 6
- 6
mallinkService/src/main/resources/mapper/WxLegionActivityMapper.xml Просмотреть файл

@@ -11,12 +11,12 @@
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
<result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
<result property="sellingCard" column="selling_card" jdbcType="INTEGER"/>
<result property="signOrder" column="sign_order" jdbcType="INTEGER"/>
<result property="difLegionOrder" column="dif_legion_order" jdbcType="INTEGER"/>
<result property="difUnionOrder" column="dif_union_order" jdbcType="INTEGER"/>
<result property="eqUnionOrder" column="eq_union_order" jdbcType="INTEGER"/>
<result property="notUnionOrder" column="not_union_order" jdbcType="INTEGER"/>
<result property="sellingCard" column="selling_card" jdbcType="DOUBLE"/>
<result property="signOrder" column="sign_order" jdbcType="DOUBLE"/>
<result property="difLegionOrder" column="dif_legion_order" jdbcType="DOUBLE"/>
<result property="difUnionOrder" column="dif_union_order" jdbcType="DOUBLE"/>
<result property="eqUnionOrder" column="eq_union_order" jdbcType="DOUBLE"/>
<result property="notUnionOrder" column="not_union_order" jdbcType="DOUBLE"/>
<result property="status" column="status" jdbcType="SMALLINT"/>
<result property="createDate" column="create_date" jdbcType="TIMESTAMP"/>
<result property="updateDate" column="update_date" jdbcType="TIMESTAMP"/>


Загрузка…
Отмена
Сохранить