diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/plantuser/PotentialClientMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/plantuser/PotentialClientMapper.xml
index bfc476e..da4a9da 100644
--- a/crm-common/src/main/resources/mapper/mapper_oracle/plantuser/PotentialClientMapper.xml
+++ b/crm-common/src/main/resources/mapper/mapper_oracle/plantuser/PotentialClientMapper.xml
@@ -35,13 +35,14 @@
+
a.id, a.client_no, a.client_name, a.dealer_id, a.staff_id, a.phone, a.status, a.stop_time, a.province_id,
a.city_id, a.region, a.grow_crops, a.grow_crops_name, a.plant_area, a.create_time, a.create_user, a.create_name,
- a.demand_desc, a.company_id, a.longitude, a.latitude, a.address, a.meeting_rule_id
+ a.demand_desc, a.company_id, a.longitude, a.latitude, a.address, a.meeting_rule_id, a.amount
@@ -104,7 +105,7 @@
INSERT INTO crm_potential_client (
id, client_no, client_name, dealer_id, staff_id, phone, status, province_id, city_id, region,
grow_crops, grow_crops_name, plant_area, create_time, create_user, create_name, demand_desc,
- company_id, longitude, latitude, address, meeting_rule_id
+ company_id, longitude, latitude, address, meeting_rule_id, amount
) VALUES (
#{id,jdbcType=VARCHAR},
#{clientNo,jdbcType=VARCHAR},
@@ -127,7 +128,8 @@
#{longitude,jdbcType=VARCHAR},
#{latitude,jdbcType=VARCHAR},
#{address,jdbcType=VARCHAR},
- #{meetingRuleId,jdbcType=VARCHAR}
+ #{meetingRuleId,jdbcType=VARCHAR},
+ #{amount,jdbcType=VARCHAR}
)
@@ -189,6 +191,9 @@
address = #{address,jdbcType=VARCHAR},
+
+ amount = #{amount,jdbcType=VARCHAR},
+
WHERE id = #{id}
diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/archives/plantuser/entity/PotentialClient.java b/crm-webapp/src/main/java/com/yb/lb/webapp/archives/plantuser/entity/PotentialClient.java
index 1827085..5088710 100644
--- a/crm-webapp/src/main/java/com/yb/lb/webapp/archives/plantuser/entity/PotentialClient.java
+++ b/crm-webapp/src/main/java/com/yb/lb/webapp/archives/plantuser/entity/PotentialClient.java
@@ -142,4 +142,8 @@ public class PotentialClient implements java.io.Serializable {
@ApiModelProperty(hidden = true)
private String fullRegionName;
+ /** 红包金额 */
+ @ApiModelProperty(value = "红包金额")
+ private String amount;
+
}
\ No newline at end of file
diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/archives/plantuser/service/PotentialClientService.java b/crm-webapp/src/main/java/com/yb/lb/webapp/archives/plantuser/service/PotentialClientService.java
index 5191672..3ce3cae 100644
--- a/crm-webapp/src/main/java/com/yb/lb/webapp/archives/plantuser/service/PotentialClientService.java
+++ b/crm-webapp/src/main/java/com/yb/lb/webapp/archives/plantuser/service/PotentialClientService.java
@@ -123,6 +123,11 @@ public class PotentialClientService {
updateRule.setId(meetingRuleId);
updateRule.setUsedNum(meetingRule.getUsedNum() + 1);
prizeMeetingRuleService.updateInfo(updateRule, ".updateCrmPrizeMeetingRule");
+ // 回写金额
+ Map params1 = new HashMap<>();
+ params1.put("id", uuid);
+ params1.put("amount", amount);
+ this.update(params1, ".updateCrmPotentialClient");
}
return true;
}
diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/wxmp/menu/MenuManager.java b/crm-webapp/src/main/java/com/yb/lb/webapp/wxmp/menu/MenuManager.java
index 3187e63..8912afe 100644
--- a/crm-webapp/src/main/java/com/yb/lb/webapp/wxmp/menu/MenuManager.java
+++ b/crm-webapp/src/main/java/com/yb/lb/webapp/wxmp/menu/MenuManager.java
@@ -81,7 +81,7 @@ public class MenuManager {
btn22.put("url", "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + WXMPCMD.APPID + "&redirect_uri=" + url + "wechat/wxResponse.html?response_type=code&scope=snsapi_userinfo&state=path~personal");
Map btn23 = new HashMap<>();
- btn23.put("name", "销售活动");
+ btn23.put("name", "促销活动");
btn23.put("type", "view");
btn23.put("url", "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + WXMPCMD.APPID + "&redirect_uri=" + url + "wechat/wxResponse.html?response_type=code&scope=snsapi_userinfo&state=path~saleroom");