bugfix

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

@@ -182,7 +182,7 @@
 		SELECT DISTINCT
 		cfs.id AS '退款记录ID',
 		s.name AS '供应商',
-		concat((cfs.refundAmount+cfs.refundBalanceAmount),if(crsr.recordRefundType = '5','（退差价）','') as '退款金额',
+		concat((cfs.refundAmount+cfs.refundBalanceAmount),if(crsr.refundType = '5','（退差价）','')) as '退款金额',
 		group_concat(crsr.shopOrderNo, '(', crsr.shopOrderID, ')') as '子订单编号',
 		group_concat(cso.orderNo, '(', cso.orderID, ')') as '订单编号',
 		u.`name` as '记录人',

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

@@ -265,10 +265,10 @@
         <label class="control-label">差价类型：</label>&nbsp;&nbsp;&nbsp;
             <input type="radio" name="type" value="1" ${(payShopDifference.differencePrice > 0 && payShopDifference.type eq 2) ? 'disabled="disabled"':'checked="true"'} onclick="showInfo()">成本上升&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             <input type="radio" name="type" value="2" ${(payShopDifference.differencePrice > 0 && payShopDifference.type eq 1) ? 'disabled="disabled"':'checked="true"'} onclick="showInfo()">成本降低&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            <img src="/static/images/info.jpg" style="height: 20px;width: 20px" onclick="alertx('“少付”指成本变高了，按旧成本付款的话相当于会少付供应商，\n'+
+            <img src="/static/images/info.jpg" style="height: 20px;width: 20px" onclick="alertx('“成本上升”指成本变高了，按旧成本付款的话相当于会少付供应商，\n'+
 '在已不能修改成本的情况下，通过补差价的方式来弥补；\n'+
 '\n'+
-'“多付”指成本变低了，按旧成本付款的话相当于会多付供应商，\n'+
+'“成本降低”指成本变低了，按旧成本付款的话相当于会多付供应商，\n'+
 '在已不能修改成本的情况下，通过退差价的方式来弥补。\n'+
 '\n'+
 '特别注意：一个子订单可以申请多次供应商差价，但是每次只能选择同一种差价类型。若要修改差价类型，需要将该子订单的所有供应商差价付款单取消后才能操作')">

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -550,7 +550,7 @@
             <th>商品说明：</th>
             <td colspan="3">
                 <form:textarea path="productDescribe" id="wipeRemarks" maxlength="200" placeholder="请输入备注文字，不能超过200字" class="input-xlarge"  rows="4"></form:textarea>
-                <p style="width:500px;text-align:right;"><span id="remarkLen" style="color:red;">0</span>/200</p>
+                <p style="width:500px;text-align:left;"><span id="remarkLen" style="color:red;">0</span>/200</p>
             </td>
         </tr>
         <tr id="allAreaInput">