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

# Conflicts:
#	src/main/java/com/caimei/modules/user/web/NewCmShopController.java
#	src/main/resources/mappings/modules/user/NewCmShopMapper.xml
#	src/main/webapp/WEB-INF/views/modules/user/maintenanceList.jsp

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

@@ -58,4 +58,6 @@ public interface NewCmShopDao extends CrudDao<NewCmShop> {
     CmDiscernReceipt cmrectiptlist(Integer shopID);
 
     Integer cmrectCount(Integer shopID);
+
+    Integer therectip();
 }

src/main/java/com/caimei/modules/user/service/NewCmShopService.java

@@ -354,7 +354,7 @@ public class NewCmShopService extends CrudService<NewCmShopDao, NewCmShop> {
         newCmShopDao.Removethelastfee(cmDiscernReceipt);
     }
 
-  @Transactional(readOnly = false)
+    @Transactional(readOnly = false)
     public void Removethelast(CmDiscernReceipt cmDiscernReceipt) {
         newCmShopDao.Removethelast(cmDiscernReceipt);
     }
@@ -371,11 +371,16 @@ public class NewCmShopService extends CrudService<NewCmShopDao, NewCmShop> {
 
     @Transactional(readOnly = false)
     public CmDiscernReceipt cmrectiptlist(Integer shopID) {
-       return newCmShopDao.cmrectiptlist(shopID);
+        return newCmShopDao.cmrectiptlist(shopID);
     }
     @Transactional(readOnly = false)
     public Integer cmrectCount(Integer shopID) {
         return newCmShopDao.cmrectCount(shopID);
     }
 
+    @Transactional(readOnly = false)
+    public Integer therectip() {
+        return newCmShopDao.therectip();
+    }
+
 }

src/main/java/com/caimei/modules/user/web/NewCmShopController.java

@@ -216,10 +216,10 @@ public class NewCmShopController extends BaseController {
             Date receipttime = formatter.parse(receiptDate);
 //如果没有缴费记录
             if(null==cmDiscern){
-            //缴纳时间加一年==到期时间
-            calendar.setTime(receipttime);
-            calendar.add(Calendar.YEAR, 1);
-            dateStrings= formatter.format(calendar.getTime());
+                //缴纳时间加一年==到期时间
+                calendar.setTime(receipttime);
+                calendar.add(Calendar.YEAR, 1);
+                dateStrings= formatter.format(calendar.getTime());
                 calendars.setTime(receipttime);
                 calendars.add(Calendar.DATE, 1);
                 validityDate= formatter.format(calendars.getTime());
@@ -246,22 +246,22 @@ public class NewCmShopController extends BaseController {
                 calendar.add(Calendar.YEAR, 1);
                 dateStrings= formatter.format(calendar.getTime());
                 if(!cmDiscern.getReceiptID().equals(discernReceipt.getList().get(i).getReceiptID())){
-        if(count != discernReceipt.getList().size()){
-                num = receipt.compareTo(dateString);
-                logger.info(">>>>>>"+num);
-                if(num>0){
-                    cmDiscernReceipt.setReceiptID(discernReceipt.getList().get(i).getReceiptID());
-                    cmDiscernReceipt.setValidityDate(cmDiscern.getExpirationDate());
-                    cmDiscernReceipt.setExpirationDate(dateStrings);
-                    newCmShopService.cmreceipt(cmDiscernReceipt);
-               } else {
-                    cmDiscernReceipt.setReceiptID(discernReceipt.getList().get(i).getReceiptID());
-                    cmDiscernReceipt.setValidityDate(validityDate);
-                    cmDiscernReceipt.setExpirationDate(dateStrings);
-                    newCmShopService.cmreceipt(cmDiscernReceipt);
+                    if(count != discernReceipt.getList().size()){
+                        num = receipt.compareTo(dateString);
+                        logger.info(">>>>>>"+num);
+                        if(num>0){
+                            cmDiscernReceipt.setReceiptID(discernReceipt.getList().get(i).getReceiptID());
+                            cmDiscernReceipt.setValidityDate(cmDiscern.getExpirationDate());
+                            cmDiscernReceipt.setExpirationDate(dateStrings);
+                            newCmShopService.cmreceipt(cmDiscernReceipt);
+                        } else {
+                            cmDiscernReceipt.setReceiptID(discernReceipt.getList().get(i).getReceiptID());
+                            cmDiscernReceipt.setValidityDate(validityDate);
+                            cmDiscernReceipt.setExpirationDate(dateStrings);
+                            newCmShopService.cmreceipt(cmDiscernReceipt);
+                        }
+                    }
                 }
-        }
-}
             }
 
             cmDiscernReceipt.setReceiptID(discernReceipt.getList().get(i).getReceiptID());
@@ -270,7 +270,7 @@ public class NewCmShopController extends BaseController {
             System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+"1:"+date+"2:"+dateStrings+"3:"+dateString);
         }
         Page<CmDiscernReceipt>discernReceip = newCmShopService.maintenanceList(new Page<CmDiscernReceipt>(request, response, 20),cmDiscernReceipt);
-            model.addAttribute("CmDiscernReceipt", cmDiscernReceipt);
+        model.addAttribute("CmDiscernReceipt", cmDiscernReceipt);
         model.addAttribute("discernReceipt", discernReceip);
         return "modules/user/maintenanceList";
     }
@@ -285,8 +285,10 @@ public class NewCmShopController extends BaseController {
 
         //获取操作时间
         sysLog.setOperationtime(new Date());
-        newCmShopService.cmreceipt(cmDiscernReceipt);
         newCmShopService.addthelast(cmDiscernReceipt);
+        cmDiscernReceipt.setReceiptID(newCmShopService.therectip().toString());
+        newCmShopService.cmreceipt(cmDiscernReceipt);
+
         //获取操作员
         SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
         System.out.println("操作员" + principal.getName());

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

@@ -456,7 +456,7 @@
                 AND (a.receiptDate < #{endTime} OR a.receiptDate = #{endTime})
             </if>
             and a.receiptDate is not null
-            ORDER BY c.dateStrings DESC
+            ORDER BY a.receiptDate DESC
         </where>
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -470,6 +470,13 @@
         values (#{shopID}, #{receStatct}, #{receiptDate}, 1, 1)
     </insert>
 
+    <select id="therectip" resultType="Integer">
+        SELECT id FROM cm_discern_receipt WHERE receStatct=2
+        ORDER BY id DESC
+        LIMIT 1
+    </select>
+
+
     <update id="Removethelast">
         update cm_discern_receipt
         set newReceiptType=1,
@@ -477,12 +484,12 @@
         where id = #{receiptID}
     </update>
 
-    <update id="addthelast">
-        update cm_discern_receipt
-        set newReceiptType=1,
-            receStatct    = 2
-        where id = #{receiptID}
-    </update>
+    <insert id="addthelast">
+        insert cm_discern_receipt
+       (receiptDate,newReceiptType,
+            receStatct,delFlag,shopID)
+            value (now(),1,2,1,#{shopID})
+    </insert>
 
     <insert id="cmreceipt">
         insert into cm_receipt
@@ -492,7 +499,7 @@
 
     <select id="cmrectiptlist" resultType="com.caimei.modules.order.entity.CmDiscernReceipt">
         SELECT r.receiptID as receiptID,r.dateStrings  as expirationDate,
-               r.validityDate as validityDate,c.receStatct as receStatct
+               r.validityDate as validityDate
         FROM cm_receipt r
                  LEFT JOIN cm_discern_receipt c ON c.id = r.receiptID
                  LEFT JOIN shop s ON s.shopID = c.shopID

src/main/webapp/WEB-INF/views/modules/archive/cmOrderArchiveForm.jsp

@@ -42,11 +42,10 @@
          * jquery控制input只能输入数字
          */
         function onlynum(obj) {
-            debugger
             obj.value = obj.value.replace(/[^\d]/g, ""); //清除"数字"以外的字符
 			var orderArchiveId = $("#id").val();
 			var shopOrderId = $("#shopOrderId").val();
-			if (shopOrderId.length >= 3) {
+			if (shopOrderId.length > 0) {
 				$.post("${ctx}/archive/cmOrderArchive/checkShopOrderId",{"id":orderArchiveId,"shopOrderId":shopOrderId},function (result) {
 					if (result.code == 0) {
 						$("#clubName").val(result.clubName);
@@ -217,7 +216,7 @@
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>子订单ID：</label>
 			<div class="controls">
-                <form:input path="shopOrderId" htmlEscape="false" maxlength="8" class="input-xlarge required" onkeyup="onlynum(this)"/>
+                <form:input path="shopOrderId" htmlEscape="false" maxlength="8" class="input-xlarge required" onblur="onlynum(this)"/>
             </div>
 		</div>
 		<div class="control-group">

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

@@ -395,6 +395,31 @@
                 <c:if test="${shopOrder.orderArchiveId ne null}">
                     <a href="${ctx}/archive/cmOrderArchive/form?id=${shopOrder.orderArchiveId}">查看订单资料</a>
                 </c:if>
+                <c:if test="${order.onlinePayFlag eq 0}">
+                    <c:if test="${order.status == 12 || order.status == 13 || order.status == 21 || order.status == 22 || order.status == 23 || order.status == 31 || order.status == 32 || order.status == 33 || order.status == 4 || order.status == 5}">
+                        <%--  返佣订单不能申请退款（退货） --%>
+                        <c:if test="${order.rebateOrder == '0'}">
+                            <c:if test="${order.toAudit eq 1}">
+                                <%--如果存在审核收款则不允许申请:1不能申请,其它可以申请--%>
+                                <c:if test="${order.toAudit eq 1}">
+                                    <%--弹窗提示--%>
+                                    <a href="#" onclick="return alertx('订单存在未审核的收款，暂不能退款。请将收款审核通过后再操作退款。')">申请退款</a>
+                                </c:if>
+                            </c:if>
+                            <c:if test="${order.toAudit ne 1}">
+                                <c:if test="${order.applyReturnedPurchaseFlag eq 1}">
+                                    <a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${order.orderID}&onlineShopOrderId=${shopOrder.shopOrderID}&refundType=1"
+                                       <c:if test="${order.status == 21 || order.status == 22 || order.status == 23}">onclick="return confirmx('部分收款的订单、申请退款只能申请全部退款！', this.href)"
+                                    </c:if>
+                                    >申请退款</a>
+                                </c:if>
+                                <c:if test="${order.applyReturnedPurchaseFlag ne 1}">
+                                    <font title="存在未处理完的申请,请前往退款列表处理！">申请退款</font>
+                                </c:if>
+                            </c:if>
+                        </c:if>
+                    </c:if>
+                </c:if>
             </div>
         </c:if>
         <c:if test="${order.onlinePayFlag eq 0}">

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

@@ -969,7 +969,7 @@
                                 <c:if test="${order.toAudit ne 1}">
                                     <%--如果存在退款记录在待审核或者审核不通过记录不允许继续退款--%>
                                     <c:if test="${order.applyReturnedPurchaseFlag eq 1}">
-                                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${order.orderID}"
+                                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${order.orderID}&refundType=1"
                                            <c:if test="${order.status == 21 || order.status == 22 || order.status == 23}">onclick="return confirmx('部分收款的订单、申请退款只能申请全部退款！', this.href)"
                                         </c:if>
                                         >

src/main/webapp/WEB-INF/views/modules/user/maintenanceList.jsp

@@ -244,11 +244,11 @@
 </table>
 <div class="pagination">${discernReceipt}</div>
 <script>
-	function offocea(receiptID,shopID,shopName,linkMan) {
+	function offocea(shopID,shopName,linkMan) {
 		$.jBox.confirm("确定为该供应商免除上架费吗？","提示",function(v,h,f){
 
 			if(v === 1){
-				window.location.href="${ctx}/user/newCmShop/Removethelastfee?receiptID="+receiptID+"&shopID="+shopID+"&shopName="+shopName+"&linkMan="+linkMan;
+				window.location.href="${ctx}/user/newCmShop/Removethelastfee?shopID="+shopID+"&shopName="+shopName+"&linkMan="+linkMan;
 			}
 		} ,{ buttons: {  '确定': 1,'取消':2}});
 	}