机器设备修改

src/main/java/com/minpay/db/table/own/mapper/MachineManageMapper.java

@@ -18,4 +18,6 @@ public interface MachineManageMapper extends  IMINMybatisEntityMapper{
 	List<Map<String, String>> queryProductz(Map<String, String> map, MINRowBounds rows);
 
 	List<Map<String, Object>> queryEquipment(Map<String, String> map, MINRowBounds rows);
+
+    List<Map<String, Object>> queryFunction(Map<String, String> map);
 }

src/main/java/com/minpay/mt/machine/action/MachineManageAction.java

@@ -120,6 +120,9 @@ public class MachineManageAction implements IMINAction {
     /**生成指定机器指定行列的货道*/
     public final static String	ADD_PRO_EQU_REL			= "addProEquRelLineRow";
 
+    /**查询商户关联页面*/
+    public final static String	QUERY_FUNCTION		= "queryFunction";
+
     private boolean contains;
 
 
@@ -1101,6 +1104,7 @@ public class MachineManageAction implements IMINAction {
         pro.setPayeeNo(payeeNo);
         pro.setCreditChannel(creditChannel);
         pro.setPayment(payment);
+        pro.setVersionType(versionType);
         pro.setPaymentType(paymentType);
         pro.setExchangeRate(exchangeRate);
         pro.setSupportBalance(supportBalance);
@@ -1495,4 +1499,32 @@ public class MachineManageAction implements IMINAction {
 		Service.lookup(ILogService.class).logging(session, logInfo);*/
         return res;
     }
+    /**
+     * 查询设备中商品
+     *
+     * @param session
+     * @return
+     * @throws MINBusinessException
+     */
+    @MINAction(value = QUERY_FUNCTION)
+    public MINActionResult queryFunction(
+            @MINParam(key = "branchId") String branchId,
+            MINSession session
+    ) throws MINBusinessException {
+
+        MINActionResult res = new MINActionResult();
+
+        User user = session.getUser();
+        //渠道
+        String channel = user.getChannel();
+        // 查询条件
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("branchId", branchId);
+        List<Map<String, Object>> list = Service.lookup(IMINDataBaseService.class)
+                .getMybatisMapper(MachineManageMapper.class)
+                .queryFunction(map);
+        //传递数据
+        res.set(IMINBusinessConstant.F_PAGING_LAY, list);
+        return res;
+    }
 }

src/main/resources/com/minpay/db/table/own/mapper/MachineManageMapper.xml

@@ -56,7 +56,7 @@
      		LEFT JOIN 	im_user u ON u.USR_ID = p.VEQ_CREATE_USER
      		LEFT JOIN im_user e on e.USR_ID = p.VEQ_MODIFY_USER
      		LEFT JOIN vm_tencent_inf vti ON vti.VTI_ID = p.VEQ_WC_ACCOUNT
-			LEFT JOIN vm_account va ON va.ACT_ID = p.VEQ_PAYEE_NO
+			LEFT JOIN vm_hl_account va ON va.ACT_ID = p.VEQ_PAYEE_NO
 			LEFT JOIN im_branch ib ON p.VEQ_BRANCHID = ib.BRH_ID
      	WHERE 1=1
      	AND p.VEQ_STATE in ("00","01")
@@ -240,4 +240,13 @@
 		</if>
 		ORDER BY equ.VEQ_STATE ASC, equ.VEQ_CREATE_TIME DESC, equ.VEQ_MACHINE_NO DESC
 	</select>
+	<select id="queryFunction" resultType="hashmap"
+			parameterType="java.util.Map">
+		SELECT
+		ifb.IIF_HTML		'html'
+		FROM im_item_function_branch fb
+		LEFT JOIN im_item_function ifb
+		ON fb.IFB_FUNCTION_ID = ifb.IIF_ID
+		WHERE fb.IFB_BRANCH = #{branchId, jdbcType = VARCHAR}
+	</select>
 </mapper>

src/main/webapp/admin/machineManage/editmachine.html

@@ -117,6 +117,8 @@
                     </div>
                 </div>
             </div>
+            <div id="huilv">
+            </div>
             <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
                 <legend style="color: #1b9eff">幸运购信息</legend>
             </fieldset>
@@ -133,14 +135,6 @@
                 </div>
             </div>
             <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label class="layui-form-label" style = "width: 120px;">汇率:</label>
-                    <div class="layui-input-inline">
-                        <input type="tel" name="exchangeRate" id = "exchangeRate" lay-verify="exchangeRate"  placeholder="请输入汇率"autocomplete="off" class="layui-input">
-                    </div>
-                </div>
-            </div>
-            <div class="layui-form-item">
                 <label class="layui-form-label fap-form-item fap-form-item-require" style="margin-left: 25px">是否支持余额：</label>
                 <div class="layui-input-block" >
                     <input type="radio" name="supportBalance" value="00" title="支持" checked="" onclick="one(0)" lay-filter="sss">
@@ -243,7 +237,20 @@
                 }
                 form.render();
             }
-    	});
+
+            $.request({
+                action : '../../MachineManageAction/queryFunction',
+                data : { branchId: rowData.branchid},
+                success : function(data) {
+                    debugger;
+                    if (data.data.length>0){
+                        $('#huilv').html(data.data[0].html);
+                        $('#exchangeRate').val(rowData.exchangeRate);
+                    }
+                    form.render();
+                }
+            });
+        });
     
 	    	
         

src/main/webapp/admin/machineManage/machineDetail.html

@@ -15,6 +15,7 @@
 </div> 
 <div class="layui-form-item box-button" >
 	        <div class="layui-input-block">
+				<button class="layui-btn" lay-submit="" lay-filter="demo6" lay-filter="demo6" >刷新</button>
 	             <button class="layui-btn" lay-submit="" lay-filter="demo4" lay-filter="demo4" >复制商品到新机器</button>
 	             <button class="layui-btn" lay-submit="" lay-filter="demo3" lay-filter="demo3" >一键设置价格</button>
 <!--	             <button class="layui-btn" lay-submit="" lay-filter="demo2" lay-filter="demo2" >一键上货</button>-->
@@ -154,6 +155,9 @@
 			});
 			return false;
 		});
+		form.on('submit(demo6)', function(data) {
+			reload();
+		});
 	})
 	function showDetail(data) {
 		var params = {};