20190521微信支付

src/main/java/com/izouma/awesomeadmin/dao/LandMarkMapper.java

@@ -42,5 +42,9 @@ public interface LandMarkMapper {
     LandMark queryLandMarkMapInfo(LandMark record);
 
     List<LandMark> queryAllLandMarkChild(LandMark record);
+
+    List<LandMark> getNavigationPackageByPage(Map<String, Object> parameter);
+
+    List<LandMark> getNavigationPackageAll(LandMark record);
 }
 

src/main/java/com/izouma/awesomeadmin/dao/LandMarkMapper.xml

@@ -924,6 +924,176 @@
 
         id desc
     </select>
+    <select id="getNavigationPackageByPage" parameterType="java.util.Map"
+            resultMap="NavigationPackageResultMap">
+        select
+        <include refid="no_map_Column_List"/>,
+        #{record.buyFlag} as buy_flag, #{record.userId} as user_id
+        from land_mark
+        <where>
+            and del_flag = 'N'
+
+            and id IN (
+            SELECT
+            DISTINCT land_mark_id
+            FROM
+            navigation_package
+            WHERE
+            del_flag = 'N'
+            AND shelf_flag = 'Y'
+
+            <if test="record.buyFlag != null and !&quot;&quot;.equals(record.buyFlag)">
+                <choose>
+                    <when test="record.buyFlag == 'Y'.toString()">
+                        AND id IN (
+                        SELECT
+                        DISTINCT package_id
+                        FROM
+                        user_order
+                        WHERE
+                        del_flag = 'N'
+                        AND status_flag = 1
+                        AND user_id = #{record.userId}
+                        )
+                    </when>
+                    <otherwise>
+
+                        AND id NOT IN (
+                        SELECT
+                        DISTINCT package_id
+                        FROM
+                        user_order
+                        WHERE
+                        del_flag = 'N'
+                        AND status_flag = 1
+                        AND user_id = #{record.userId}
+                        )
+                    </otherwise>
+                </choose>
+            </if>
+
+            )
+
+            <if test="record.distance != null and !&quot;&quot;.equals(record.distance)">
+
+                <![CDATA[
+                   AND ( ACOS(
+                SIN((#{record.latKey} * PI()) / 180) * SIN((latitude * PI()) / 180) +
+                COS((#{record.latKey} * PI()) / 180) * COS((latitude * PI()) / 180) * COS(
+                (#{record.lngKey} * PI()) / 180 - (longitude * PI()) / 180
+                )
+                ) * 6371.004 )  <= #{record.distance}
+                    AND longitude > #{record.lngKey} - 3
+                    AND longitude < #{record.lngKey} + 3
+                    AND latitude > #{record.latKey} - 3
+                    AND latitude < #{record.latKey} + 3
+                    ]]>
+            </if>
+
+
+        </where>
+        order by
+
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id desc
+
+    </select>
+    <select id="getNavigationPackageAll" parameterType="java.util.Map"
+            resultMap="NavigationPackageResultMap">
+        select
+        <include refid="no_map_Column_List"/>,
+        #{buyFlag} as buy_flag, #{userId} as user_id
+        from land_mark
+        <where>
+            and del_flag = 'N'
+
+            and id IN (
+            SELECT
+            DISTINCT land_mark_id
+            FROM
+            navigation_package
+            WHERE
+            del_flag = 'N'
+            AND shelf_flag = 'Y'
+
+            <if test="buyFlag != null and !&quot;&quot;.equals(buyFlag)">
+                <choose>
+                    <when test="buyFlag == 'Y'.toString()">
+                        AND id IN (
+                        SELECT
+                        DISTINCT package_id
+                        FROM
+                        user_order
+                        WHERE
+                        del_flag = 'N'
+                        AND status_flag = 1
+                        AND user_id = #{userId}
+                        )
+                    </when>
+                    <otherwise>
+
+                        AND id NOT IN (
+                        SELECT
+                        DISTINCT package_id
+                        FROM
+                        user_order
+                        WHERE
+                        del_flag = 'N'
+                        AND status_flag = 1
+                        AND user_id = #{userId}
+                        )
+                    </otherwise>
+                </choose>
+            </if>
+
+            )
+
+            <if test="distance != null and !&quot;&quot;.equals(distance)">
+
+                <![CDATA[
+                   AND ( ACOS(
+                SIN((#{latKey} * PI()) / 180) * SIN((latitude * PI()) / 180) +
+                COS((#{latKey} * PI()) / 180) * COS((latitude * PI()) / 180) * COS(
+                (#{lngKey} * PI()) / 180 - (longitude * PI()) / 180
+                )
+                ) * 6371.004 )  <= #{distance}
+                    AND longitude > #{lngKey} - 3
+                    AND longitude < #{lngKey} + 3
+                    AND latitude > #{latKey} - 3
+                    AND latitude < #{latKey} + 3
+                    ]]>
+            </if>
+
+
+        </where>
+        order by
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        id desc
+
+    </select>
     <select id="queryLandMarkByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.LandMark">
         select
         <include refid="Base_Column_List"/>
@@ -2164,5 +2334,14 @@
         </collection>
     </resultMap>
 
+    <resultMap id="NavigationPackageResultMap" type="com.izouma.awesomeadmin.model.LandMark" extends="BaseResultMap">
+
+
+        <collection property="navigationPackageList" ofType="com.izouma.awesomeadmin.model.NavigationPackage"
+                    select="com.izouma.awesomeadmin.dao.NavigationPackageMapper.queryAllNavigationPackageForLankMark"
+                    column="{landMarkId = id, buyFlag=buy_flag, userId = user_id}">
+        </collection>
+    </resultMap>
+
 </mapper>
 

src/main/java/com/izouma/awesomeadmin/dao/NavigationPackageMapper.java

@@ -22,6 +22,8 @@ public interface NavigationPackageMapper{
 
     List<NavigationPackage> queryAllNavigationPackage(NavigationPackage record);
 
+    List<NavigationPackage> queryAllNavigationPackageForLankMark(NavigationPackage record);
+
     List<NavigationPackage> queryNavigationPackageByPage(Map<String, Object> parameter);
 
     int delete(NavigationPackage record);

src/main/java/com/izouma/awesomeadmin/dao/NavigationPackageMapper.xml

@@ -438,6 +438,72 @@
 
         id desc
     </select>
+    <select id="queryAllNavigationPackageForLankMark" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.NavigationPackage">
+        select
+        <include refid="Base_Column_List"/>
+        from navigation_package
+        <where>
+            and del_flag = 'N'
+            and shelf_flag = 'Y'
+            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+                and id in (${idStr})
+            </if>
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="landMarkId != null and !&quot;&quot;.equals(landMarkId)">
+                and land_mark_id = #{landMarkId}
+            </if>
+
+            <if test="buyFlag != null and !&quot;&quot;.equals(buyFlag)">
+                <choose>
+                    <when test="buyFlag == 'Y'.toString()">
+                        AND id IN (
+                        SELECT
+                        DISTINCT package_id
+                        FROM
+                        user_order
+                        WHERE
+                        del_flag = 'N'
+                        AND status_flag = 1
+                        AND user_id = #{userId}
+                        )
+                    </when>
+                    <otherwise>
+
+                        AND id NOT IN (
+                        SELECT
+                        DISTINCT package_id
+                        FROM
+                        user_order
+                        WHERE
+                        del_flag = 'N'
+                        AND status_flag = 1
+                        AND user_id = #{userId}
+                        )
+                    </otherwise>
+                </choose>
+            </if>
+
+        </where>
+        order by
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+
+        id desc
+    </select>
     <select id="queryNavigationPackage" parameterType="java.util.Map"
             resultType="com.izouma.awesomeadmin.model.NavigationPackage">
         select

src/main/java/com/izouma/awesomeadmin/datasource/DynamicDataSource.java

@@ -3,6 +3,7 @@ package com.izouma.awesomeadmin.datasource;
 import com.izouma.awesomeadmin.model.DataSourceInfo;
 import com.izouma.awesomeadmin.util.Const;
 import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
 
 import javax.sql.DataSource;
@@ -18,6 +19,9 @@ public class DynamicDataSource extends AbstractRoutingDataSource {
     protected DataSource determineTargetDataSource() {
         // 根据数据库选择方案，拿到要访问的数据库
         String dataSourceName = determineCurrentLookupKey();
+        if (StringUtils.isEmpty(dataSourceName)) {
+            dataSourceName = "dataSource";
+        }
         if (!dataSourceName.equals("dataSource")) {
             DataSource datasource = (DataSource) targetDataSource.get(DynamicDataSourceHolder.getDataSource());
             if (datasource == null) {

src/main/java/com/izouma/awesomeadmin/model/LandMark.java

@@ -37,6 +37,11 @@ public class LandMark {
     private String remark3;
     private String frontLevelId;
 
+    private Integer userId;
+    private String buyFlag;
+
+    private List<NavigationPackage> navigationPackageList;
+
     private VuforiaImageGroup vuforiaImageGroup;
 
     private List<VuforiaImageInfo> vuforiaImageInfoList;
@@ -536,6 +541,30 @@ public class LandMark {
         this.addStepStr = addStepStr;
     }
 
+    public String getBuyFlag() {
+        return buyFlag;
+    }
+
+    public void setBuyFlag(String buyFlag) {
+        this.buyFlag = buyFlag;
+    }
+
+    public List<NavigationPackage> getNavigationPackageList() {
+        return navigationPackageList;
+    }
+
+    public void setNavigationPackageList(List<NavigationPackage> navigationPackageList) {
+        this.navigationPackageList = navigationPackageList;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
     @Override
     public String toString() {
         return "LandMark{" +

src/main/java/com/izouma/awesomeadmin/model/NavigationPackage.java

@@ -31,6 +31,9 @@ public class NavigationPackage {
 
     private String searchKey;
 
+    private String buyFlag;
+
+
     /**
      * and,test_name,like,value;or,remark,=,123
      */
@@ -192,5 +195,13 @@ public class NavigationPackage {
     public void setUserId(Integer userId) {
         this.userId = userId;
     }
+
+    public String getBuyFlag() {
+        return buyFlag;
+    }
+
+    public void setBuyFlag(String buyFlag) {
+        this.buyFlag = buyFlag;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/LandMarkService.java

@@ -33,5 +33,9 @@ public interface LandMarkService{
     LandMark getLandMarkMapInfo(LandMark record);
 
     List<LandMark> getLandMarkChildList(LandMark record);
+
+    List<LandMark> getNavigationPackageByPage(Page page, LandMark record);
+
+    List<LandMark> getNavigationPackageAll(LandMark record);
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/LandMarkServiceImpl.java

@@ -100,6 +100,38 @@ public class LandMarkServiceImpl implements LandMarkService {
         return null;
     }
 
+    @Override
+    public List<LandMark> getNavigationPackageByPage(Page page, LandMark record) {
+
+        logger.info("getNavigationPackageByPage");
+        try {
+
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
+
+            return landMarkMapper.getNavigationPackageByPage(parameter);
+        } catch (Exception e) {
+            logger.error("getNavigationPackageByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public List<LandMark> getNavigationPackageAll(LandMark record) {
+
+        logger.info("getNavigationPackageAll");
+        try {
+
+            return landMarkMapper.getNavigationPackageAll(record);
+        } catch (Exception e) {
+            logger.error("getNavigationPackageAll", e);
+        }
+
+        return null;
+    }
+
     @Override
     public List<LandMark> getCityLandMarkByPage(Page page, LandMark record) {
 

src/main/java/com/izouma/awesomeadmin/web/LandMarkController.java

@@ -340,5 +340,35 @@ public class LandMarkController {
 
 
     }
+
+    /**
+     * <p>导游包分页查询。</p>
+     */
+    @RequestMapping(value = "/navigationPackagePage", method = RequestMethod.GET)
+    @ResponseBody
+    public Result navigationPackagePage(Page page, LandMark record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<LandMark> pp = landMarkService.getNavigationPackageByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+    /**
+     * 导游包全部信息
+     *
+     * @param record
+     * @return
+     */
+    @RequestMapping(value = "/navigationPackageAll", method = RequestMethod.GET)
+    @ResponseBody
+    public Result navigationPackageAll(LandMark record) {
+        List<LandMark> pp = landMarkService.getNavigationPackageAll(record);
+
+        return new Result(true, pp);
+    }
+
 }
 

src/main/java/com/izouma/weixin/model/AccessToken.java

@@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 public class AccessToken implements Serializable {
     private String accessToken;
     private String timeStamp;    //序列化忽略的属性，无论该成员变量是否有值    @JsonIgnore
-    private String extraProperty;
+    private String type;
 
     public String getAccessToken() {
         return accessToken;
@@ -28,11 +28,11 @@ public class AccessToken implements Serializable {
         this.timeStamp = timeStamp;
     }
 
-    public String getExtraProperty() {
-        return extraProperty;
+    public String getType() {
+        return type;
     }
 
-    public void setExtraProperty(String extraProperty) {
-        this.extraProperty = extraProperty;
+    public void setType(String type) {
+        this.type = type;
     }
 }

src/main/java/com/izouma/weixin/web/WeiXinController.java

@@ -297,23 +297,26 @@ public class WeiXinController {
 
             String timeStamp = MbappUtil.create_timestamp();
             String nonceStr = MbappUtil.create_nonce_str();
-            String packageStr = "prepay_id=" + unified.get("prepay_id");
             //生成sign签名
             Map<String, String> params = new HashMap<>();
 
-            params.put("appId", config.getAppID());
-            params.put("timeStamp", timeStamp);
-            params.put("nonceStr", nonceStr);
-            params.put("package", packageStr);
+            params.put("appid", config.getAppID());
+            params.put("partnerid", config.getMchID());
+            params.put("prepayid", unified.get("prepay_id"));
+            params.put("timestamp", timeStamp);
+            params.put("noncestr", nonceStr);
+            params.put("package", "Sign=WXPay");
 
             result.put("appId", config.getAppID());
-            result.put("timeStamp", timeStamp);
-            result.put("nonceStr", nonceStr);
-            result.put("myPackage", packageStr);
-            result.put("paySign", WXPayUtil.generateSignature(params, config.getKey()));
+            result.put("partnerid", config.getMchID());
+            result.put("prepayid", unified.get("prepay_id"));
+            result.put("timestamp", timeStamp);
+            result.put("noncestr", nonceStr);
+            result.put("package", "Sign=WXPay");
+            result.put("sign", WXPayUtil.generateSignature(params, config.getKey()));
 
-            result.put("prepay_id", unified.get("prepay_id"));
-            result.put("code_url", unified.get("code_url"));
+
+            //result.put("code_url", unified.get("code_url"));
         } catch (Exception e) {
             logger.error("", e);
         }

src/main/resources/properties/outsidews.properties

@@ -1,6 +1,6 @@
 projectname=yimishijie
 weixinapi=https://api.weixin.qq.com/sns/oauth2/
-weixinappid=wx8d16412d33eaf19c
+weixinappid=wxc64234d6fdccca35
 weixinsecret=4c16604a837d8c2929c33a03a5080e60
 aliossid=PXzJyah5rZfWHIIH
 aliosskey=e1MS6j0wypXJrw8CM0hObZu8qKbfah
@@ -11,15 +11,15 @@ rongyunappkey=pwe86ga5ee376
 rongyunappsecret=ARj0hyU5Cp
 jwtsecret=3MgWy/pJjxHCQW2pHlQbkjomTUPRo9WhsPFjUPYZZlo=
 host=http://1eaed69e.ngrok.io
-base_domain=https://www.tutuxiang.com/
+base_domain=http://www.liuhuohuyu.com/
 ALIPAY_APP_ID=2016101100660827
 ALIPAY_APP_PRIVATE_KEY=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDNbcuW0ij0mOezs+mRAYoyXlN5jZzr8WaO4q1kXTy7Xu9+C3+vurYgrqb9j+IeVsph4rhyF9P98H0cFQABnumiV6jaY3/wke/9aj8uBV5zvHC3GrkSDUQotPAmE+blwqFdofQsaoOuHOR1FfstLg29jOaVipoNvkSGmOJqfIjAGaMEQy7p2S2jLIqyKGMj71TvoITAMCkkwbim0kmbN4reh5XPKTeT2upOa+64FNnYK3mJ141e2LNWNx2HAIhaw88+KUiHNXUS3LA+aGw0inZP3UdSPAetsEagNeD+NXNtWf7DeABn/0K8SGgUkScODeC8TesOpS5lcmVj5W5w9hK7AgMBAAECggEBAIzxG5Fqtza6AZ5FfaZDTDGqjdMD2fn3Mcous4/8eEKFrALqmLxUeciKi3/ES/tMyKXIC4wb1RKRAQVXUx3JjboYMn1Dbu/68JEJaDeG73qwexTlfLxp5a2YFnvJg813b4byKriei6HVqNi8MAybYEoAdeN7qJ5tQE6obg9pSdmhgg6tnza51ASlwepZqxQ2YDMvROg7KA2PHlIrdVhLBy0GGG3YvSxsl2jOmXst96mihYa6vD4rXZjVXnd+kwS+x5Mpw7tLdEkS+PSrFRFpW6W0LwnGcJm1lC3L5X8wQ+lXGT3X2TrZV4j+NCwTyn3WFr3yGRnLAzJD5vMJI/sTY8ECgYEA8o1+9ZW7XIvO+zIBEsq177pEYlqFoW2e8acokeYPXex6RmIhaikQVegnwSQcu8hvD2Gh0ozGEH1Y47vCvGi6Q9pswy4pT47BQyuir/8EVSPsO+2atWa/YXot0Gcmm2GSWXT/DNJViaGB+oT4m15mCDtzVeJIndytglx0TF9saFMCgYEA2NFob1K+fi4+NZD8WrkAnjPKodeOsu+YxNnB3E53xd8BgVLVgC9F/eEwDkbWazil5Wykwf07OGbBK5+rUv9w2DHJMHyaGQ5HpCRx06P2gxquFdudXjWwV+6TseEQDloyE13oKT8+oJBedYTNI3D6mjGv+ni+gksaU74WS0mtvvkCgYEAx5SSUTXBk6ceyyccJwBRsE6Oknd12Zy/2ov3IAYzws8g1eVNJXNgk6+RdqVmV0XXzMpDQ2K+Xzck+062MB3kloyWTgwfxezrLYAsP7EROZVzfuRGFtnSxDyqkf8uj1A8Agv5Ce3QoI0azK65ee60+jUg9BxcMDkzND8rGuSx6S0CgYAu2JAH/YjLGpK2YC0mLPLFO8t8TGa4oqwPXD1WrF2UkypwFsWqfIxS3mTTsNqDMCon9+FhSKWS+iCinE0YEbj//UHLCCEDaOJxxK4TXEnW6dzTPDA0OsVvOk0PEeG2OCa5qICQ6OlPJ+JA4gCwt6htyG6NX6lJ3ZBCp7+JZNH1gQKBgCbsC8LzVOLIw6GR87X0oeWTfq7KKVD6rMfG58jHpTSAdY6ge9f2CyxKhfUyemZtu7BsRCFeuI5NDmtmg5uXS6Nu1dL/R5Xs33mB64fwYX/kXErnrHYrCekC1uIM8I/hTyVfbUvoMArq+3s2W7KTmq63ygBEnNOAqomJDHeW+/wv
 ALIPAY_CHARSET=utf-8
 ALIPAY_ALIPAY_PUBLIC_KEY=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzW3LltIo9Jjns7PpkQGKMl5TeY2c6/FmjuKtZF08u17vfgt/r7q2IK6m/Y/iHlbKYeK4chfT/fB9HBUAAZ7poleo2mN/8JHv/Wo/LgVec7xwtxq5Eg1EKLTwJhPm5cKhXaH0LGqDrhzkdRX7LS4NvYzmlYqaDb5EhpjianyIwBmjBEMu6dktoyyKsihjI+9U76CEwDApJMG4ptJJmzeK3oeVzyk3k9rqTmvuuBTZ2Ct5ideNXtizVjcdhwCIWsPPPilIhzV1EtywPmhsNIp2T91HUjwHrbBGoDXg/jVzbVn+w3gAZ/9CvEhoFJEnDg3gvE3rDqUuZXJlY+VucPYSuwIDAQAB
 ALIPAY_SELLER=2088102179082444
 ALIPAY_GATEWAY=https://openapi.alipaydev.com/gateway.do
-weixin_mch_id=1480639272
+weixin_mch_id=1533580721
 weixin_mch_secret=
-weixin_notify_url=
+weixin_notify_url=http://www.liuhuohuyu.com/wx/notify
 weixin_cert_path=/home/cert/apiclient_cert.p12
 weixin_notify_url_recharge=

src/main/resources/spring/appDataSource.xml

@@ -79,9 +79,9 @@
         <!-- 配置MyBatis全局配置文件：mybatis-config.xml -->
         <property name="configLocation" value="classpath:mybatis/mybatis-config.xml"/>
         <!-- 扫描entity包 使用别名 -->
-        <property name="typeAliasesPackage" value="com.izouma.awesomeadmin.model"/>
+        <property name="typeAliasesPackage" value="com.izouma.awesomeadmin.model,com.izouma.weixin.model"/>
         <!-- 扫描sql配置文件：mapper需要的xml文件 -->
-        <property name="mapperLocations" value="classpath:com/izouma/awesomeadmin/dao/*Mapper.xml"/>
+        <property name="mapperLocations" value="classpath:com/izouma/awesomeadmin/dao/*Mapper.xml,com/izouma/weixin/dao/*Mapper.xml"/>
     </bean>
 
 
@@ -90,7 +90,7 @@
         <!-- 注入sqlSessionFactory -->
         <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
         <!-- 给出需要扫描dao接口包 -->
-        <property name="basePackage" value="com.izouma.awesomeadmin.dao"/>
+        <property name="basePackage" value="com.izouma.awesomeadmin.dao,com.izouma.weixin.dao"/>
 
     </bean>
 

src/main/resources/spring/appWebService.xml

@@ -13,6 +13,7 @@
 
 	<!-- 扫描service包下所有使用注解的类型 -->
 	<context:component-scan base-package="com.izouma.awesomeadmin.service" />
+	<context:component-scan base-package="com.izouma.weixin.service" />
 
 	<!-- 配置事务管理器 -->
 	<bean id="transactionManager"

src/main/resources/spring/spring-mvc.xml

@@ -42,6 +42,7 @@
 
     <!-- 4:扫描web相关的bean -->
     <context:component-scan base-package="com.izouma.awesomeadmin.web"/>
+    <context:component-scan base-package="com.izouma.weixin.web"/>
 
 
     <bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">

src/main/vue/src/pages/NavigationPackage.vue

@@ -29,6 +29,11 @@
       <el-form-item prop="shelfFlag" label="是否上线">
         <el-switch v-model="formData.shelfFlag" active-color="#13ce66" inactive-color="#ff4949" :disabled="'shelfFlag'==subColumn"></el-switch>
       </el-form-item>
+
+      <el-form-item prop="aimPlace" label="点标ID">
+        <el-input v-model="formData.aimPlace" type="textarea" :rows="2" placeholder="点标ID用英文逗号分隔，如 12,13,14"></el-input>
+      </el-form-item>
+
       <el-form-item>
         <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
         <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>

src/main/vue/src/pages/NavigationPackageSelect.vue

@@ -61,7 +61,7 @@ export default {
             this.formData[this.subColumn] = this.subValue;
           }
 
-          var list = res.data.aimPlace.split(',');
+          var list = res.data.aimPlace ? res.data.aimPlace.split(',') : [];
           list.forEach(item => {
             this.checkKeys.push('aimPlaceInfoList_' + item)
           })
@@ -268,33 +268,33 @@ export default {
 </script>
 <style lang="less" scoped>
 .custom-tree-node {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  font-size: 14px;
-  padding-right: 8px;
-  line-height: 30px;
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 14px;
+    padding-right: 8px;
+    line-height: 30px;
 
-  span {
-    small {
-      color: #409eff;
-      //   font-size: 9px;
+    span {
+        small {
+            color: #409eff;
+            //   font-size: 9px;
+        }
     }
-  }
 }
 
 .tree {
-  height: 500px;
-  overflow: auto;
-  margin-top: 20px;
-  border-top: 1px solid #eee;
+    height: 500px;
+    overflow: auto;
+    margin-top: 20px;
+    border-top: 1px solid #eee;
 }
 
 .node-title {
-  width: 500px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+    width: 500px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 </style>

src/main/vue/src/pages/NavigationPackages.vue

@@ -55,7 +55,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="scope">
-                    <el-button @click="selectRow(scope.row)" type="primary" size="mini" plain>导游包</el-button>
+                    <!-- <el-button @click="selectRow(scope.row)" type="primary" size="mini" plain>导游包</el-button> -->
                     <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
                 </template>