xubh 4 年之前
父节点
当前提交
518050734e

+ 1 - 1
src/main/java/com/minpay/common/pay/ShouhuoPay.java

@@ -199,7 +199,7 @@ public class ShouhuoPay implements IMINAction{
 
 				notify_url = notify_url + "/ShouhuoPay/personalPayCallBack";
 				String turntablePage = Service.lookup(IPublicService.class).getSysParValue(user.getChannel() + "_SHOUHUO_TURNTABLE_PAGE");
-				turntablePage = turntablePage.concat("orderId="+orderId);
+				turntablePage = turntablePage.concat("orderId="+orderId).concat("&equId="+ordInf.getEquipmentId()).concat("#/pages/turntable/turntable");
 				Huilianpay prePay = new Huilianpay();
 				IHuilianPayService huilianPayService = new HuilianPayServiceImpl();
 				if("91".equals(payType)){

+ 10 - 4
src/main/java/com/minpay/shouhuo/orderaction/OrderAction.java

@@ -13,10 +13,8 @@ import com.minpay.common.util.CommonUtil;
 import com.minpay.common.util.RegexUtil;
 import com.minpay.db.table.mapper.VmOrderDetailsMapper;
 import com.minpay.db.table.mapper.VmOrderDrawDetailMapper;
-import com.minpay.db.table.model.VmOrderDetails;
-import com.minpay.db.table.model.VmOrderDetailsExample;
-import com.minpay.db.table.model.VmOrderDrawDetail;
-import com.minpay.db.table.model.VmOrderDrawDetailExample;
+import com.minpay.db.table.mapper.VmProductInfMapper;
+import com.minpay.db.table.model.*;
 import com.minpay.db.table.own.mapper.OrderMapper;
 import com.minpay.shouhuo.paymentaction.PaymentAction;
 import com.startup.minpay.frame.business.IMINAction;
@@ -218,6 +216,14 @@ public class OrderAction implements IMINAction{
 		List<VmOrderDetails> list = Service.lookup(IMINDataBaseService.class)
 												.getMybatisMapper(VmOrderDetailsMapper.class)
 												.selectByExample(detailExample);
+		for (int i = 0; i < list.size(); i++) {
+			VmOrderDetails vmOrderDetails = list.get(i);
+			VmProductInf vmProductInf = Service.lookup(IMINDataBaseService.class)
+					.getMybatisMapper(VmProductInfMapper.class)
+					.selectByPrimaryKey(vmOrderDetails.getProductId());
+			vmOrderDetails.setRemarks(vmProductInf.getFmpic());
+			list.set(i,vmOrderDetails);
+		}
 		//传递参数
 		res.set(IMINBusinessConstant.F_PAGING_LAY, list);
 		return res;