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

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

@@ -112,9 +112,6 @@
 			<if test="orderType == 2">
 				AND co.orderType = 2
 			</if>
-			<if test="orderType != 2">
-				AND co.orderType != 2
-			</if>
             <if test="id != null and id != ''">
                 AND a.id = #{id}
             </if>

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

@@ -1320,7 +1320,9 @@
         SELECT COUNT(*) FROM
         cm_receipt_order_relation cror
         LEFT JOIN cm_discern_receipt cdr ON cdr.id = receiptID
+        LEFT JOIN cm_order co ON cror.orderId = co.orderId
         WHERE cdr.payWay=1
+          AND co.orderType != 2
           AND cror.orderID=#{orderID}
     </select>
     <insert id="insertSplitAccount">

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

@@ -359,7 +359,7 @@
                 success: function (data) {
                     $("#province").html("");
                     $("#province").append("<option value=''>省</option>");
-                    for (var i = 1; i < data.length; i++) {
+                    for (var i = 0; i < data.length; i++) {
                         if (curProvince != '' && curProvince != null && typeof (curProvince) != "undefined" && curProvince == data[i].name) {
                             $("#province").append("<option value='" + data[i].id + "' provinceId=" + data[i].id + " selected>" + data[i].name + "</option>");
                             $(".select2-chosen").eq(1).html(curProvince);