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

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/entity/SplitAccountPo.java

@@ -218,4 +218,27 @@ public class SplitAccountPo implements Serializable {
     public void setSplitTime(Date splitTime) {
         this.splitTime = splitTime;
     }
+
+    @Override
+    public String toString() {
+        return "SplitAccountPo{" +
+                "id=" + id +
+                ", orderId=" + orderId +
+                ", shopOrderId=" + shopOrderId +
+                ", productId=" + productId +
+                ", orderProductId=" + orderProductId +
+                ", shopId=" + shopId +
+                ", vipRecordId=" + vipRecordId +
+                ", couponRecordId=" + couponRecordId +
+                ", authVipRecordId=" + authVipRecordId +
+                ", type=" + type +
+                ", subUserNo='" + subUserNo + '\'' +
+                ", splitAccount=" + splitAccount +
+                ", mbOrderId='" + mbOrderId + '\'' +
+                ", orderRequestNo='" + orderRequestNo + '\'' +
+                ", payStatus=" + payStatus +
+                ", productType=" + productType +
+                ", splitTime=" + splitTime +
+                '}';
+    }
 }

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

@@ -1264,7 +1264,7 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
         }
     }
 
-    @Transactional(readOnly = false)
+    @Transactional(readOnly = false,rollbackFor = Exception.class)
     public void settlement(String shopOrderId, Double settleAmount) throws Exception {
         // 结算付供应商
         String format = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss.SSS").format(new Date());
@@ -1279,7 +1279,7 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
         }
     }
 
-    @Transactional(readOnly = false)
+    @Transactional(readOnly = false,rollbackFor = Exception.class)
     public void settleOrder(String P2_orderId, Double settleAmount, String P3_customerNumber, String shopOrderId, Integer settleFlag) throws Exception {
         //子订单id，结算金额
         Map<String, String> sPara = new HashMap<String, String>();

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

@@ -275,9 +275,9 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
         return page;
     }
 
-    public void setValue(List<NewShopOrder> payOrderList){
+    public void setValue(List<NewShopOrder> payOrderList) {
         for (NewShopOrder so : payOrderList) {
-            Integer onlineFlag=newOrderDao.findOnlinePay(so.getOrderID())>0?1:0;
+            Integer onlineFlag = newOrderDao.findOnlinePay(so.getOrderID()) > 0 ? 1 : 0;
             so.setOnlineFlag(onlineFlag);
             //统计该子订单的主的收款金额和收款状态
             NewOrder newOrder = newOrderDao.get(so.getOrderID().toString());
@@ -434,9 +434,6 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
 
     public Page<NewOrder> findPaymentOrderList(Page<NewOrder> page, NewOrder newOrder) {
         newOrder.setPage(page);
-        List<SettleRecord> settleRecord = newOrderDao.findSettleRecord(newOrder.getOrderID());
-        Integer num=null==settleRecord?0:settleRecord.size();
-        newOrder.setSettleRecordNum(num);
         if (newOrder.getPayStatus() != null && newOrder.getPayStatus() != "") {
             String[] split = newOrder.getPayStatus().split(",");
             newOrder.setPs(split);
@@ -451,7 +448,10 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
             orderIds = cmDiscernReceiptDao.findRebateOrderID(orderList.stream().map(NewOrder::getOrderID).collect(Collectors.toList()));
         }
         for (NewOrder order : orderList) {
-            if("0".equals(order.getOnlinePayFlag())){
+            List<SettleRecord> settleRecord = newOrderDao.findSettleRecord(order.getOrderID());
+            Integer num = null == settleRecord ? 0 : settleRecord.size();
+            order.setSettleRecordNum(num);
+            if ("0".equals(order.getOnlinePayFlag())) {
                 order.setSettleAmount(newOrderDao.findSettleAmount(order.getOrderID()));
             }
             if (orderIds != null && orderIds.contains(order.getOrderID())) {
@@ -694,7 +694,7 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
         return newShopOrderDao.findSettleRecord(shopOrderID);
     }
 
-    public List<Integer> payWay(Integer shoprderID){
+    public List<Integer> payWay(Integer shoprderID) {
         return newShopOrderDao.payWay(shoprderID);
     }
 }

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

@@ -36,7 +36,7 @@ public class SplitAccountService extends BaseService {
     @Resource
     private RedisService redisService;
 
-    @Transactional(readOnly = false)
+    @Transactional(readOnly = false,rollbackFor = Exception.class)
     public void SplitAccount() {
         logger.info("【手动分账开始】>>>>>>>>>>手动分账");
         Calendar calendar = Calendar.getInstance();
@@ -244,7 +244,7 @@ public class SplitAccountService extends BaseService {
     }
 
 
-    private List<SplitAccountPo> setSplitAccountDetail(ShopOrderVo shopOrder, PayParamBo payParam) {
+    public List<SplitAccountPo> setSplitAccountDetail(ShopOrderVo shopOrder, PayParamBo payParam) {
         List<SplitAccountPo> list = new ArrayList<>();
         // 本次支付金额,单位/元
         double payAmount = payParam.getAllPay();

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/OrderMapper.xml

@@ -1226,7 +1226,7 @@
     <select id="findSupport" resultType="java.lang.Integer">
         SELECT s.chargeSupport FROM shop s
         LEFT JOIN cm_shop_order cso ON cso.shopId= s.shopId
-        WHERE cso.shopOrderId=25059
+        WHERE cso.shopOrderId=#{shopOrderId}
     </select>
     <select id="getOrderProductByShopOrderId" resultType="com.caimei.modules.order.entity.OrderProductVo">
         SELECT cop.orderProductID                                                 AS orderProductId,

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/cmSettlementForm.jsp

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