Merge remote-tracking branch 'origin/developerD' into developer

src/main/java/com/caimei/modules/newhome/entity/NewPageFloorContent.java

@@ -224,27 +224,27 @@ public class NewPageFloorContent implements Serializable {
     private String jumpImage5;
 
     /**
-     * 跳转类型1（颜选）：1链接，2商品，3图片
+     * 跳转类型1（颜选）：1链接，2商品，3图片，4无
      */
     private Integer jumpType1;
 
     /**
-     * 跳转类型2（颜选）：1链接，2商品，3图片
+     * 跳转类型2（颜选）：1链接，2商品，3图片，4无
      */
     private Integer jumpType2;
 
     /**
-     * 跳转类型3（颜选）：1链接，2商品，3图片
+     * 跳转类型3（颜选）：1链接，2商品，3图片，4无
      */
     private Integer jumpType3;
 
     /**
-     * 跳转类型4（颜选）：1链接，2商品，3图片
+     * 跳转类型4（颜选）：1链接，2商品，3图片，4无
      */
     private Integer jumpType4;
 
     /**
-     * 跳转类型5（颜选）：1链接，2商品，3图片
+     * 跳转类型5（颜选）：1链接，2商品，3图片，4无
      */
     private Integer jumpType5;
 

src/main/java/com/caimei/modules/order/dao/CmOfflineCollectionDao.java

@@ -41,6 +41,8 @@ public interface CmOfflineCollectionDao extends CrudDao<CmOfflineCollection> {
     // 银行账号逻辑删除
     void updateBank(@Param("id") String id);
 
+    // 旧表银行账号删除
+    void delReceipt(@Param("id") Integer id);
     // 获取下拉列表
     List<CmOfflineCollection> downList();
 

src/main/java/com/caimei/modules/order/dao/CmPayShopDao.java

@@ -3,6 +3,7 @@ package com.caimei.modules.order.dao;
 import com.caimei.modules.order.entity.CmDiscernReceipt;
 import com.caimei.modules.order.entity.CmPayShop;
 import com.caimei.modules.order.entity.NewShopOrder;
+import com.caimei.modules.product.entity.Product;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 import org.apache.ibatis.annotations.Param;
@@ -30,4 +31,6 @@ public interface CmPayShopDao extends CrudDao<CmPayShop> {
     List<Integer> getShopOrderIdsList(@Param("payShopID") String payShopID);
 
     List<CmDiscernReceipt> getDiscernReceipts(Integer shopOrderId);
+
+    List<Product> priceNum(@Param("orderNo") String orderNo);
 }

src/main/java/com/caimei/modules/order/service/CmOfflineCollectionService.java

@@ -46,12 +46,12 @@ public class CmOfflineCollectionService extends CrudService<CmOfflineCollectionD
         int typeMax = cmOfflineCollectionDao.typeMax();
         typeMax = typeMax +1;
         cmOfflineCollection.setType(typeMax);
-        // 酒标银行账号添加
+        // 旧表银行账号添加
         CmReceiType receiType = new CmReceiType();
         receiType.setId(cmOfflineCollection.getType());
         receiType.setType(cmOfflineCollection.getBankAccount());
-        // 线下银行账号数据添加
         cmOfflineCollectionDao.insReceipt(receiType);
+        // 线下银行账号数据添加
         int i = cmOfflineCollectionDao.insBank(cmOfflineCollection);
         if (i > 0) {
             return true;
@@ -59,6 +59,11 @@ public class CmOfflineCollectionService extends CrudService<CmOfflineCollectionD
         return false;
     }
 
+    /**
+     * 设置商城显示
+     * @param cmOfflineCollection
+     * @return
+     */
     @Transactional(readOnly = false)
     public Boolean upBankDisplay (CmOfflineCollection cmOfflineCollection) {
         int i = cmOfflineCollectionDao.upBankDisplay(cmOfflineCollection);
@@ -68,6 +73,11 @@ public class CmOfflineCollectionService extends CrudService<CmOfflineCollectionD
         return false;
     }
 
+    /**
+     * 设为商城不显示
+      * @param cmOfflineCollection
+     * @return
+     */
     @Transactional(readOnly = false)
     public Boolean NoBankDisplay (CmOfflineCollection cmOfflineCollection) {
         int i = cmOfflineCollectionDao.upNoBankDisplay(cmOfflineCollection);
@@ -83,23 +93,39 @@ public class CmOfflineCollectionService extends CrudService<CmOfflineCollectionD
         return bankData;
     }
 
-    // 编辑页面修改保存
+    /**
+     * 编辑页面修改保存
+      * @param cmOfflineCollection
+     */
     @Transactional(readOnly = false)
     public void editData(CmOfflineCollection cmOfflineCollection) {
         cmOfflineCollectionDao.edit(cmOfflineCollection);
     }
 
+    /**
+     * 银行账号禁用
+     * @param cmOfflineCollection
+     */
     @Transactional(readOnly = false)
     public void updateBank(CmOfflineCollection cmOfflineCollection) {
+        // 线下收款列表银行禁用
         cmOfflineCollectionDao.updateBank(cmOfflineCollection.getId());
+        // 旧表银行删除
+        cmOfflineCollectionDao.delReceipt(cmOfflineCollection.getType());
     }
 
-    // 线下收款账号下拉列表
+    /**
+     * 线下收款账号下拉列表
+     * @return
+     */
     public List<CmOfflineCollection> downListData() {
         return cmOfflineCollectionDao.downList();
     }
 
-    // 下拉列表获取所有线下收款账号
+    /**
+     * 下拉列表获取所有线下收款账号
+      * @return
+     */
     public List<CmReceiType> downAllListData() {
         return cmOfflineCollectionDao.downAllList();
     }

src/main/java/com/caimei/modules/order/service/CmPayShopService.java

@@ -11,6 +11,7 @@ import com.caimei.modules.order.utils.Disguiser;
 import com.caimei.modules.order.utils.MyBeanUtils;
 import com.caimei.modules.order.utils.RSA;
 import com.caimei.modules.order.utils.SettlePostFormUtil;
+import com.caimei.modules.product.entity.Product;
 import com.caimei.modules.sys.utils.UploadImageUtils;
 import com.caimei.modules.user.dao.NewCmShopDao;
 import com.caimei.modules.user.entity.NewCmShop;
@@ -232,8 +233,10 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                  1. 若发生退货，数量要减去已退货和已取消的数量
                  2. 有赠品的商品只能全退
                  */
+
+                Integer returnNum = 0;
                 for (NewOrderProduct p : orderProductList) {
-                    Integer returnNum = newOrderProductDao.CountReturnedPurchaseProduct(so.getShopOrderID(), p.getOrderProductID());
+                    returnNum = newOrderProductDao.CountReturnedPurchaseProduct(so.getShopOrderID(), p.getOrderProductID());
                     returnNum = returnNum == null ? 0 : returnNum;
                     p.setReturnedNum(returnNum);
                 }
@@ -279,8 +282,29 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 List<String> strings = newShopOrderDao.findShopOrderNos(so.getOrderID());
                 so.setShopOrderNos(strings);
                 //主订单总佣金
+                List<Product> product = cmPayShopDao.priceNum(so.getOrderNo());
+                // 计算订单总佣金
                 Double income = newShopOrderDao.findIncome(so.getOrderID());
-                so.setIncome(income);
+                if(returnNum != null) {
+                    if(product != null) {
+                        for (Product pro : product) {
+                            Integer number = newOrderProductDao.CountReturnedPurchaseProduct(pro.getShopOrderID(), pro.getOrderProductID());
+                            Double commission = 0.0;
+                            if(number != null && number != 0) {
+                                if (pro.getTaxRate() != null && pro.getTaxRate() != 0) {
+                                    commission = (pro.getPrice() + pro.getPrice() * (pro.getTaxRate() / 100)) - (Double.parseDouble(pro.getCostPrice()) + Double.parseDouble(pro.getCostPrice()) * (pro.getTaxRate() / 100));
+                                } else {
+                                    commission = pro.getPrice() - Double.parseDouble(pro.getCostPrice());
+                                }
+                                income -= (commission * number);
+
+                            }
+                        }
+                        so.setIncome(income);
+                    }
+                } else {
+                    so.setIncome(income);
+                }
                 //若成本下降太多导致部分收款的钱，已经大于成本重新计算佣金
                 if ("0".equals(newOrder.getOnlinePayFlag()) && so.getShopReceiptStatus() == 2) {
                     double mum = so.getProductAmount();
@@ -346,9 +370,11 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 }
                 List<NewOrderProduct> orderProductList = newOrderProductDao.findByShopOrderID(so.getShopOrderID());
                 /* 退货数量 */
+                Integer count = 0;
                 for (NewOrderProduct p : orderProductList) {
-                    Integer count = newOrderProductDao.CountReturnedPurchaseProduct(so.getShopOrderID(), p.getOrderProductID());
-                    p.setReturnedNum(count == null ? 0 : count);
+                    count = newOrderProductDao.CountReturnedPurchaseProduct(so.getShopOrderID(), p.getOrderProductID());
+                    count = count == null ? 0 : count;
+                    p.setReturnedNum(count);
                 }
                 if (so.getShopPostFee() == null) so.setShopPostFee(0D);
                 if (so.getShopTaxFee() == null) so.setShopTaxFee(0D);
@@ -392,8 +418,26 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 List<String> strings = newShopOrderDao.findShopOrderNos(so.getOrderID());
                 so.setShopOrderNos(strings);
                 //主订单总佣金
+                List<Product> product = cmPayShopDao.priceNum(so.getOrderNo());
+                // 计算佣金
                 Double income = newShopOrderDao.findIncome(so.getOrderID());
-                so.setIncome(income);
+                if(count != 0) {
+                    for(Product pro: product) {
+                        Double commission = pro.getPrice() - Double.parseDouble(pro.getCostPrice());
+                        Integer number = newOrderProductDao.CountReturnedPurchaseProduct(pro.getShopOrderID(), pro.getOrderProductID());
+                        if(number != null && number != 0) {
+                            if (pro.getTaxRate() != null && pro.getTaxRate() != 0) {
+                                commission = (pro.getPrice() + pro.getPrice() * (pro.getTaxRate() / 100)) - (Double.parseDouble(pro.getCostPrice()) + Double.parseDouble(pro.getCostPrice()) * (pro.getTaxRate() / 100));
+                            } else {
+                                commission = pro.getPrice() - Double.parseDouble(pro.getCostPrice());
+                            }
+                            income -= (commission * number);
+                        }
+                    }
+                    so.setIncome(income);
+                } else {
+                    so.setIncome(income);
+                }
             }
 
             cmPayShop.setShopOrders(csos);

src/main/java/com/caimei/modules/order/service/CmReturnedPurchaseService.java

@@ -569,7 +569,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                 //部分退货
                 newOrder.setRefundType("1");
             }
-            if (newOrder.getRechargeGoods() != null) {
+            if (newOrder.getRechargeGoods() != null && newOrder.getRechargeGoods() != 3) {
                 newOrder.setStatus(NewOrderStatus.WAIT_COMMENT.getCode());
             }
             newOrderService.update(newOrder);

src/main/java/com/caimei/modules/product/entity/Product.java

@@ -285,6 +285,13 @@ public class Product extends DataEntity<Product> {
      */
     public String qualificationLink;
 
+    //子订单ID
+    private Integer shopOrderID;
+    //订单商品ID
+    private Integer orderProductID;
+    //税率
+    private Double taxRate;
+
     public String[] getValidFlagString() {
         return validFlagString;
     }
@@ -1696,4 +1703,28 @@ public class Product extends DataEntity<Product> {
     public void setReceiptID(String receiptID) {
         this.receiptID = receiptID;
     }
+
+    public Integer getShopOrderID() {
+        return shopOrderID;
+    }
+
+    public void setShopOrderID(Integer shopOrderID) {
+        this.shopOrderID = shopOrderID;
+    }
+
+    public Integer getOrderProductID() {
+        return orderProductID;
+    }
+
+    public void setOrderProductID(Integer orderProductID) {
+        this.orderProductID = orderProductID;
+    }
+
+    public Double getTaxRate() {
+        return taxRate;
+    }
+
+    public void setTaxRate(Double taxRate) {
+        this.taxRate = taxRate;
+    }
 }

src/main/java/com/caimei/modules/user/dao/NewCmClubDao.java

@@ -20,6 +20,8 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
 
     List<NewCmClub> findClubById(Integer clubID);
 
+    List<NewCmClub> textUserValue();
+
     NewCmClub getclubByUserId(Integer userId);
 
     Integer findSpId(Integer spID);

src/main/java/com/caimei/modules/user/entity/NewCmClub.java

@@ -69,6 +69,9 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     private String medicalPracticeLicenseImg; // 医美分类必须上传医疗执业许可证
     private String socialCreditCode;//统一社会编码
 
+    private Integer valueID;     // 测试ID
+    private String activeState;     // 活跃状态
+    private String customerValue;   // 客户价值
     /**
      * 非持久化字段
      */
@@ -891,6 +894,30 @@ public class NewCmClub extends DataEntity<NewCmClub> {
         this.socialCreditCode = socialCreditCode;
     }
 
+    public Integer getValueID() {
+        return valueID;
+    }
+
+    public void setValueID(Integer valueID) {
+        this.valueID = valueID;
+    }
+
+    public String getActiveState() {
+        return activeState;
+    }
+
+    public void setActiveState(String activeState) {
+        this.activeState = activeState;
+    }
+
+    public String getCustomerValue() {
+        return customerValue;
+    }
+
+    public void setCustomerValue(String customerValue) {
+        this.customerValue = customerValue;
+    }
+
     public Integer getUserOrganizeID() {
         return userOrganizeID;
     }

src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java

@@ -165,6 +165,7 @@ private VisitRemarkDao visitRemarkDao;
         }
 
         Page<NewCmClub> page = newCmClubService.findPage(new Page<NewCmClub>(request, response, 20), newCmClub);
+
         model.addAttribute("newCmClub", newCmClub);
         model.addAttribute("page", page);
         return "modules/userNew/cmAgencyList";

src/main/resources/config/dev/caimei.properties

@@ -159,43 +159,43 @@ keyword.product=E\:\\Knowlege\\keyword.txt
 
 #\u7528\u6237\u5546\u54C1\u4EF7\u683C\u8FC7\u5C0F\u90AE\u4EF6\u63D0\u793A
 #user.mails=jun.li@caimei365.com
-# 易宝分账后台
+# \u6613\u5B9D\u5206\u8D26\u540E\u53F0
 yeepay.appkey=BM12345678902069
 yeepay.secretKey=OH6huQqihk0ZfGzWgR1WcQ==
 yeepay.secretRoot=https://openapi.yeepay.com/yop-center
 yeepay.divideCallback=http://localhost:8181/a/order/newShouldPay/divideCallback
 yeepay.mails=jun.li@caimei365.com
 
-#΢���������
+#\u03A2\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 appId=wx91c4152b60ca91a3
 appSecret=a563dd2c07c9c815a4e697c8b6cb73dc
 token=caimei
-##�Ƿ����Ϣ���м��ܣ��Ƿ����Ϣ���м��ܣ���Ӧ��΢��ƽ̨����Ϣ�ӽ��ܷ�ʽ��false֧������ģʽ������ģʽ��true֧�ְ�ȫģʽ������ģʽ
+##\uFFFD\u01F7\uFFFD\uFFFD\uFFFD\uFFFD\u03E2\uFFFD\uFFFD\uFFFD\u043C\uFFFD\uFFFD\u0723\uFFFD\uFFFD\u01F7\uFFFD\uFFFD\uFFFD\uFFFD\u03E2\uFFFD\uFFFD\uFFFD\u043C\uFFFD\uFFFD\u0723\uFFFD\uFFFD\uFFFD\u04E6\uFFFD\uFFFD\u03A2\uFFFD\uFFFD\u01BD\u0328\uFFFD\uFFFD\uFFFD\uFFFD\u03E2\uFFFD\u04FD\uFFFD\uFFFD\u0737\uFFFD\u02BD\uFFFD\uFFFDfalse\u05A7\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0123\u02BD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0123\u02BD\uFFFD\uFFFDtrue\u05A7\uFFFD\u05B0\uFFFD\u022B\u0123\u02BD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0123\u02BD
 encryptMessage=false
 encodingAesKey=pxdm0VFrAEydPeZGCSz5QdyukwgFjmWohFDDy0dHiOk
-##΢�Žӿڵ�ַ
+##\u03A2\uFFFD\u017D\u04FF\u06B5\uFFFD\u05B7
 wx.getToken=https\://api.weixin.qq.com/cgi-bin/token
 wx.getMaterial=https\://api.weixin.qq.com/cgi-bin/material/batchget_material
 wx.getMaterialCount=https\://api.weixin.qq.com/cgi-bin/material/get_materialcount
 
-#运费商品默认ID
+#\u8FD0\u8D39\u5546\u54C1\u9ED8\u8BA4ID
 freightProductID=999
 
 cm.config=dev
-#直接读取服务器位置文件
+#\u76F4\u63A5\u8BFB\u53D6\u670D\u52A1\u5668\u4F4D\u7F6E\u6587\u4EF6
 export.template=export
 
-# SPI-server（CKEditor5图片上传API，搜索更新索引）
+# SPI-server\uFF08CKEditor5\u56FE\u7247\u4E0A\u4F20API\uFF0C\u641C\u7D22\u66F4\u65B0\u7D22\u5F15\uFF09
 caimei.spi=http://localhost:8008
 caimei.core=https://localhost:18002
 caimei.manager=http://localhost:9527
-#阿里云oss存储
+#\u963F\u91CC\u4E91oss\u5B58\u50A8
 aliyun.accessKeyId=LTAI4GBL3o4YkWnbKYgf2Xia
 aliyun.accessKeySecret=dBjAXqbYiEPP6Ukuk2ZsXQeET7FVkK
 aliyun.bucketName=caimei-oss
 aliyun.endpoint=https://oss-cn-shenzhen.aliyuncs.com
 
-#商品资料库文件临时路径
+#\u5546\u54C1\u8D44\u6599\u5E93\u6587\u4EF6\u4E34\u65F6\u8DEF\u5F84
 archive.tempPath=D:\\poi-test\\tempFile\\
-#ffmpeg路径
+#ffmpeg\u8DEF\u5F84
 ffmpeg.path=D:\\workSoftWare\\ffmpeg\\bin\\ffmpeg.exe

src/main/resources/mappings/modules/order/CmOfflineCollectionMapper.xml

@@ -62,6 +62,9 @@
         UPDATE cm_offline_collection
         SET isDisable = 0 WHERE id =#{id}
     </update>
+    <delete id="delReceipt">
+        delete from cm_receipt_type where id = #{id}
+    </delete>
 
     <select id="downList" resultType="com.caimei.modules.order.entity.CmOfflineCollection">
         SELECT id,bankAccount,type FROM cm_offline_collection WHERE isDisable != 0

src/main/resources/mappings/modules/order/CmPayShopMapper.xml

@@ -150,7 +150,12 @@
 			</otherwise>
 		</choose>
 	</select>
-
+	<select id="priceNum" resultType="com.caimei.modules.product.entity.Product">
+		SELECT cso.shopOrderID,cop.orderProductID,cop.taxRate,cop.discountPrice as price,cop.costPrice as costPrice FROM cm_order co
+				 LEFT JOIN cm_order_product cop ON co.orderID = cop.orderID
+				 LEFT JOIN cm_shop_order cso ON cop.shopOrderNo = cso.shopOrderNo
+				 LEFT JOIN product p ON cop.productID = p.productID WHERE co.orderNo =  #{orderNo}
+	</select>
 	<insert id="insert" parameterType="CmPayShop"  keyProperty="id" useGeneratedKeys="true">
 		INSERT INTO cm_pay_shop(
 			shopID,

src/main/resources/mappings/modules/user/NewCmClubMapper.xml

@@ -88,14 +88,20 @@
         WHERE a.userID = #{userID}
     </select>
 
+    <select id="textUserValue" resultType="NewCmClub">
+        SELECT userID as valueID, activeState, customerValue FROM cm_organ_value_system WHERE stage = 0 AND delType = 1
+    </select>
+
 
     <select id="findList" resultType="NewCmClub">
         SELECT
         <include refid="newCmClubColumns"/>
-        <include refid="otherColumns"/>,u.userPermission,u.source
+        <include refid="otherColumns"/>,u.userPermission,u.source, covs.activeState,covs.customerValue
         FROM club a
         <include refid="newCmClubJoins"/>
+        left join cm_organ_value_system covs on a.userID = covs.userID
         <where>
+            covs.stage = 0 AND covs.delType = 1
             <if test="clubID != null and clubID != ''">
                 AND a.clubID = #{clubID}
             </if>
@@ -147,7 +153,13 @@
             <if test="newDeal != null">
                 AND a.newDeal =#{newDeal}
             </if>
-            AND (u.userOrganizeID IN(0,1) or u.clubStatus != 92)
+            <if test="activeState != null and activeState != ''">
+                AND covs.activeState = #{activeState}
+            </if>
+            <if test="customerValue != null and customerValue != ''">
+                AND covs.customerValue = #{customerValue}
+            </if>
+             AND (u.userOrganizeID IN(0,1) or u.clubStatus != 92)
         </where>
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheFloorContentForm.jsp

@@ -403,6 +403,9 @@
                                                           htmlEscape="false"/>
                                         </form:select>
                                     </div>
+                                    <div style="margin-top: 20px">
+                                        <input type="radio" name="jumpType1" value="4" onchange="changeJumpType(1)" ${floorContent.jumpType1 eq 4? "checked" : ""} />无
+                                    </div>
                                 </div>
                             </div>
                             <div style="float: left;margin: 25px 0px 0px 100px">
@@ -439,7 +442,7 @@
                                 <div style="margin-left: 100px">
                                     <div>
                                         <input type="radio" name="jumpType2" value="1" onchange="changeJumpType(2)" ${(floorContent.jumpType2 eq null || floorContent.jumpType2 eq 1 )? "checked" : ""} />链接：
-                                        <form:input path="adsLink1" htmlEscape="false" maxlength="255"
+                                        <form:input path="adsLink2" htmlEscape="false" maxlength="255"
                                                     class="input-xlarge"/>
                                     </div>
                                     <div style="margin-top: 20px">
@@ -450,6 +453,9 @@
                                                           htmlEscape="false"/>
                                         </form:select>
                                     </div>
+                                    <div style="margin-top: 20px">
+                                        <input type="radio" name="jumpType2" value="4" onchange="changeJumpType(2)" ${floorContent.jumpType2 eq 4? "checked" : ""} />无
+                                    </div>
                                 </div>
                             </div>
                             <div style="float: left;margin: 25px 0px 0px 100px">
@@ -497,6 +503,9 @@
                                                           htmlEscape="false"/>
                                         </form:select>
                                     </div>
+                                    <div style="margin-top: 20px">
+                                        <input type="radio" name="jumpType3" value="4" onchange="changeJumpType(3)" ${floorContent.jumpType3 eq 4? "checked" : ""} />无
+                                    </div>
                                 </div>
                             </div>
                             <div style="float: left;margin: 25px 0px 0px 100px">
@@ -544,6 +553,9 @@
                                                           htmlEscape="false"/>
                                         </form:select>
                                     </div>
+                                    <div style="margin-top: 20px">
+                                        <input type="radio" name="jumpType4" value="4" onchange="changeJumpType(4)" ${floorContent.jumpType4 eq 4? "checked" : ""} />无
+                                    </div>
                                 </div>
                             </div>
                             <div style="float: left;margin: 25px 0px 0px 100px">
@@ -591,6 +603,9 @@
                                                           htmlEscape="false"/>
                                         </form:select>
                                     </div>
+                                    <div style="margin-top: 20px">
+                                        <input type="radio" name="jumpType5" value="4" onchange="changeJumpType(5)" ${floorContent.jumpType5 eq 4? "checked" : ""} />无
+                                    </div>
                                 </div>
                             </div>
                             <div style="float: left;margin: 25px 0px 0px 100px">

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheImageForm.jsp

@@ -126,6 +126,9 @@
 		</div>
 		<div class="control-group">
 			<label class="control-label">跳转方式：</label>
+			<div class="controls" style="margin-top: 10px">
+				<input type="radio" name="jumpType" value="4" class="relative-pst" onchange="changeJumpType()" ${cmHeheImage.jumpType eq 4 ? "checked" : ""} />无：
+			</div>
 			<div class="controls">
 				<input type="radio" name="jumpType" value="1" class="relative-pst" onchange="changeJumpType()" ${(cmHeheImage.jumpType eq null || cmHeheImage.jumpType eq 1 )? "checked" : ""} />链接：
 				<form:input path="jumpLink" htmlEscape="false" class="input-xxlarge relative-pst"/>

src/main/webapp/WEB-INF/views/modules/newhome/beautyFloorContentForm.jsp

@@ -927,7 +927,48 @@
                                     <img src="/static/template/beauty/pc/29.png">
                                 </div>
                             </div>
+                            <div id="pcTemplate30" class="displayTemplate">
+                                <form:radiobutton path="templateType" name="templateType" value="30" label="模板30" id="templateType30"
+                                                  cssClass="templateButton"
+                                                  onclick="showContent('pc')"/>
+                                <em class="middleEm">偏展会活动</em>
+                                <em class="rightEm">PC端</em>
+                                <div class="templateImageDiv">
+                                    <img src="/static/template/beauty/pc/26.png">
+                                </div>
+                            </div>
+                            <div id="pcTemplate31" class="displayTemplate">
+                                <form:radiobutton path="templateType" name="templateType" value="31" label="模板31" id="templateType31"
+                                                  cssClass="templateButton"
+                                                  onclick="showContent('pc')"/>
+                                <em class="middleEm">偏展会活动</em>
+                                <em class="rightEm">PC端</em>
+                                <div class="templateImageDiv">
+                                    <img src="/static/template/beauty/pc/27.png">
+                                </div>
+                            </div>
+                            <div id="pcTemplate32" class="displayTemplate">
+                                <form:radiobutton path="templateType" name="templateType" value="32" label="模板32" id="templateType32"
+                                                  cssClass="templateButton"
+                                                  onclick="showContent('pc')"/>
+                                <em class="middleEm">偏展会活动</em>
+                                <em class="rightEm">PC端</em>
+                                <div class="templateImageDiv">
+                                    <img src="/static/template/beauty/pc/28.png">
+                                </div>
+                            </div>
+                            <div id="pcTemplate33" class="displayTemplate">
+                                <form:radiobutton path="templateType" name="templateType" value="33" label="模板33" id="templateType33"
+                                                  cssClass="templateButton"
+                                                  onclick="showContent('pc')"/>
+                                <em class="middleEm">偏展会活动</em>
+                                <em class="rightEm">PC端</em>
+                                <div class="templateImageDiv">
+                                    <img src="/static/template/beauty/pc/29.png">
+                                </div>
+                            </div>
                         </div>
+
                         <div id="appletsTemplate" class="hide">
                             <div id="appletsTemplate1" class="displayTemplate">
                                 <form:radiobutton path="templateType" name="templateType" value="51" label="模板1" id="templateType51"
@@ -1220,6 +1261,46 @@
                                     <img src="/static/template/beauty/applets/29.png">
                                 </div>
                             </div>
+                            <div id="appletsTemplate30" class="displayTemplate">
+                                <form:radiobutton path="templateType" name="templateType" value="80" label="模板30" id="templateType80"
+                                                  cssClass="templateButton"
+                                                  onclick="showContent('applets')"/>
+                                <em class="middleEm">偏展会活动</em>
+                                <em class="rightEm">移动端</em>
+                                <div class="templateImageDiv">
+                                    <img src="/static/template/beauty/applets/26.png">
+                                </div>
+                            </div>
+                            <div id="appletsTemplate31" class="displayTemplate">
+                                <form:radiobutton path="templateType" name="templateType" value="81" label="模板31" id="templateType81"
+                                                  cssClass="templateButton"
+                                                  onclick="showContent('applets')"/>
+                                <em class="middleEm">偏展会活动</em>
+                                <em class="rightEm">移动端</em>
+                                <div class="templateImageDiv">
+                                    <img src="/static/template/beauty/applets/27.png">
+                                </div>
+                            </div>
+                            <div id="appletsTemplate32" class="displayTemplate">
+                                <form:radiobutton path="templateType" name="templateType" value="82" label="模板32" id="templateType82"
+                                                  cssClass="templateButton"
+                                                  onclick="showContent('applets')"/>
+                                <em class="middleEm">偏展会活动</em>
+                                <em class="rightEm">移动端</em>
+                                <div class="templateImageDiv">
+                                    <img src="/static/template/beauty/applets/28.png">
+                                </div>
+                            </div>
+                            <div id="appletsTemplate33" class="displayTemplate">
+                                <form:radiobutton path="templateType" name="templateType" value="83" label="模板33" id="templateType83"
+                                                  cssClass="templateButton"
+                                                  onclick="showContent('applets')"/>
+                                <em class="middleEm">偏展会活动</em>
+                                <em class="rightEm">移动端</em>
+                                <div class="templateImageDiv">
+                                    <img src="/static/template/beauty/applets/29.png">
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </td>
@@ -1296,7 +1377,7 @@
         var templateType = $("input[name='templateType']:checked").val();
         if (templateType != undefined) {
             //数据填充
-            if (templateType == 1 || templateType == 2 || (templateType >= 7 && templateType <= 10) || (templateType >= 26 && templateType <= 29)) {
+            if (templateType == 1 || templateType == 2 || (templateType >= 7 && templateType <= 10) || (templateType >= 26 && templateType <= 33)) {
                 <c:forEach items="${floorContent.floorImageList}" var="floorImage" varStatus="index">
                 adsImageList1.push({
                     id: "${floorImage.id}",
@@ -1392,7 +1473,7 @@
         $("#templateClassify").val(templateClassify);
         var list = [];
         var type;
-        for (var i = 1; i <= 29; i++) {
+        for (var i = 1; i <= 33; i++) {
             if ('pc' == templateClassify) {
                 list.push('#pcTemplate' + i);
             } else {
@@ -1441,7 +1522,7 @@
                 $('.Image1').show();
             }
             //删除按钮和表格展示
-            if (templateType == 1 || templateType == 2 || (templateType >= 7 && templateType <= 10) || (templateType >= 26 && templateType <= 29)) {
+            if (templateType == 1 || templateType == 2 || (templateType >= 7 && templateType <= 10) || (templateType >= 26 && templateType <= 33)) {
                 if (adsImageList1.length == 0) {
                     $("#del").attr("disabled", "disabled");
                 } else {

src/main/webapp/WEB-INF/views/modules/order/cmPayShopForm.jsp

@@ -943,7 +943,7 @@
         });
 
         $('.pay-table').each(function () {
-            debugger
+            // debugger
             var thisEle = $(this),
                 totalComissionVal = 0,
                 resVal = '';

src/main/webapp/WEB-INF/views/modules/order/cmPayShopOtherCheck.jsp

@@ -589,7 +589,10 @@
             <label style="font-weight: bold; font-size:18px">转账支付：</label>
             <span id="transferPayFee" style="font-weight: bold; font-size:18px"><fmt:formatNumber value="${cmPayShop.transferPayFee}" pattern="#,##0.00"/> </span>
             <label>付款银行：</label><span>
-					<select name="payType">
+            <c:forEach  items="${offlineCollections}" var="offlineCollections" varStatus="index">
+                <option value="${offlineCollections.type}">${offlineCollections.bankAccount}</option>
+            </c:forEach>
+					<%--<select name="payType">
 						<option value="1">建设银行7297</option>
 						<option value="2">中信银行0897</option>
 						<option value="3">中信银行7172</option>
@@ -597,7 +600,7 @@
 						<option value="5">广发银行5461</option>
 						<option value="7">华夏银行2400</option>
 						<option value="8">中国银行9452</option>
-					</select>
+					</select>--%>
 				</span>
             <label>付款时间：</label>
             <span>${cmPayShop.payTime}</span>

src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyList.jsp

@@ -45,6 +45,7 @@
         #alertModal .alert-content{width:260px;height:60px;padding:20px}
         #alertModal .alertModal-btn{width:260px;height:49px;padding:0 20px;border-top:1px solid #EBEBEB}
         #alertModal .alertModal-btn button{float:right;margin:5px}
+        .acticer_span{display: inline-block;width: 14px;height: 14px;border-radius: 50%;box-sizing: border-box;border: 1px solid #999999;text-align: center;color: #333333;font-size: 12px;line-height: 14px;float: none;margin-left: 3px;}
     </style>
 </head>
 <body>
@@ -91,6 +92,30 @@
                 <form:option value="8" label="超级会员"/>
             </form:select>
         </div>
+        <label class="control-label">活跃状态：</label>
+        <form:select path="activeState" class="input-medium">
+            <form:option value="" label="请选择"/>
+            <form:option value="新增用户" label="新增用户"/>
+            <form:option value="活跃用户" label="活跃用户"/>
+            <form:option value="不活跃用户" label="不活跃用户"/>
+            <form:option value="流失用户" label="流失用户"/>
+            <form:option value="回流用户" label="回流用户"/>
+            <form:option value="忠诚用户" label="忠诚用户"/>
+            <form:option value="沉默用户" label="沉默用户"/>
+        </form:select>
+
+        <label class="control-label">客户价值：</label>
+        <form:select path="customerValue" class="input-medium">
+            <form:option value="" label="请选择"/>
+            <form:option value="一般保持客户" label="一般保持客户"/>
+            <form:option value="一般发展客户" label="一般发展客户"/>
+            <form:option value="一般价值客户" label="一般价值客户"/>
+            <form:option value="一般挽留客户" label="一般挽留客户"/>
+            <form:option value="重要保持客户" label="重要保持客户"/>
+            <form:option value="重要发展客户" label="重要发展客户"/>
+            <form:option value="重要价值客户" label="重要价值客户"/>
+            <form:option value="重要挽留客户" label="重要挽留客户"/>
+        </form:select>
         <div class="item">
             <label>注册时间：</label>
             <form:input path="searchStartTime" type="text" maxlength="20" class="input-mini Wdate" value="${startTime}"
@@ -125,6 +150,8 @@
         <th>状态</th>
         <th>审核人</th>
         <th>机构类别</th>
+        <th>活跃状态<span class="acticer_span" onmousemove="activeStageMessage(1)">?</span></th>
+        <th>客户价值<span class="acticer_span" onmousemove="activeStageMessage(2)">?</span></th>
         <th>注册IP</th>
         <th>注册时间</th>
         <th>审核时间</th>
@@ -220,6 +247,9 @@
                     <font color="red">(普通会员)</font>
                 </c:if>
             </td>
+            <td>${newCmClubList.activeState}</td>
+            <td>${newCmClubList.customerValue}</td>
+
             <td>
                 <c:if test="${newCmClubList.registerIP eq '192.168.1.10'}">
                     协销代注册
@@ -814,7 +844,30 @@
         };
         $.jBox(html, {title: "审核", submit: submit});
     }
+    function activeStageMessage(type) {// 客户价值提示语
+        var content = '1.新增用户：30天内新注册的用户'+'<br/>'+
+            '2.活跃用户：90天内登录过商城的用户（排除新增用户和回流客户）'+'<br/>'+
+            '3.不活跃用户：90天内未登录过商城的用户（排除流失用户）'+'<br/>'+
+            '4.流失用户：两年内未登录且没有订单的机构'+'<br/>'+
+            '5.回流用户：上一统计阶段的流失用户中后续登录商城的用户或者后续有订单的用户'+'<br/>'+
+            '6.忠诚用户：90天内登录过商城且一年内有订单记录的用户'+'<br/>'+
+            '7.沉默用户：两年内未登录过商城，但是在90天内存在订单的用户（排除回流客户）';
+
+        var content2 = '1. 一般保持客户，指最近一次交易距今时间大于60天，交易频率大于等于一月一次，上个月交易金额小于￥100000的客户'+'<br/>'+
+            '2. 一般发展客户，指最近一次交易距今时间小于等于60天，交易频率小于一月一次，上个月交易金额小于￥100000的客户'+'<br/>'+
+            '3. 一般价值客户，指最近一次交易距今时间小于等于60天，交易频率大于等于一月一次，上个月交易金额小于￥100000的客户'+'<br/>'+
+            '4. 一般挽留客户，指最近一次交易距今时间大于60天，交易频率小于一月一次，上个月交易金额小于￥100000的客户'+'<br/>'+
+            '5.重要保持客户，指最近一次交易距今时间大于60天，交易频率大于等于一月一次，上个月交易金额大于等于￥100000的客户'+'<br/>'+
+            '6.重要发展客户，指最近一次交易距今时间小于等于60天，交易频率小于一月一次，上个月交易金额大于等于￥100000的客户'+'<br/>'+
+            '7.重要价值客户，指最近一次交易距今时间小于等于60天，交易频率大于等于一月一次，上个月交易金额大于等于￥100000的客户'+'<br/>'+
+            '8.重要挽留客户，指最近一次交易距今时间大于60天，交易频率小于一月一次，上个月交易金额大于等于￥100000的客户';
 
+        var typeMap = {
+                1:content,
+                2:content2
+            }
+        $.jBox.alert(typeMap[type],'提示',{ width: 450 })
+    }
 </script>
 </body>
 </html>