Quellcode durchsuchen

查询是否中奖

xubh vor 4 Jahren
Ursprung
Commit
aa0a8ab02a

+ 4 - 3
src/main/java/com/huilian/api/open/huilianjavademo/MyConfig.java

@@ -6,8 +6,8 @@ package com.huilian.api.open.huilianjavademo;
  * @Date 2018/9/30 11:32
  */
 public class MyConfig {
-    public static final String reqUrl = "https://open.huilianpay.com";
-//    public static final String reqUrl = "http://localhost:8080";
+  public static final String reqUrl = "https://open.huilianpay.com";
+ // public static final String reqUrl = "http://chen.cmine.top";
 
     public static final String isvOrgId = "11621";
 
@@ -24,7 +24,8 @@ public class MyConfig {
 
 
     //正式商户
-    public static final String hlMerchantId = "1162162410001";
+    //public static final String hlMerchantId = "1162162410001";
+    public static final String hlMerchantId = "1162165810002";
 
     public static final boolean isSign = true;
 

+ 1 - 1
src/main/java/com/minpay/common/service/impl/OrderServiceImpl.java

@@ -177,7 +177,7 @@ public class OrderServiceImpl implements IOrderService {
 						ordetInf.setModifyTime(nowTime);				//修改时间
 						//执行新增订单详情数据
 						Service.lookup(IMINDataBaseService.class)
-								.getMybatisMapper(VmOrderDetailsMapper.class).insert(ordetInf);
+								.getMybatisMapper(VmOrderDetailsMapper.class).insertSelective(ordetInf);
 						//累加订单总金额
 						orderAmt = CommonUtil.add(orderAmt, amount);
 						flag ++;

+ 6 - 19
src/main/java/com/minpay/shouhuo/orderaction/OrderAction.java

@@ -11,7 +11,10 @@ import com.minpay.common.format.IFormatService;
 import com.minpay.common.service.IOrderService;
 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.own.mapper.OrderMapper;
@@ -148,7 +151,6 @@ public class OrderAction implements IMINAction{
 	 * 小程序会员下单 	校验
 	 * @param equNo		售货机编号
 	 * @param proType	下单类型00正常商品01抽奖商品
-	 * @param detData	商品数据包
 	 * @param session
 	 * @throws MINBusinessException
 	 */
@@ -210,27 +212,12 @@ public class OrderAction implements IMINAction{
 		MINActionResult res = new MINActionResult();
 		//获取操作员信息
 		User user = session.getUser();
-		Map<String,String> map = new HashMap<String,String>();
-		//传入渠道验证map
-		map.put("channel", user.getChannel());
-		map.put("orderId", orderId);
-		Map<String, String> draw = Service.lookup(IMINDataBaseService.class)
-											.getMybatisMapper(OrderMapper.class)
-											.queryOrdersttDraw(map);
-		if(draw == null){
-			throw new MINBusinessException("订单信息错误!");
-		}
 		//新中奖详情
-		VmOrderDrawDetailExample detailExample = new VmOrderDrawDetailExample();
+		VmOrderDetailsExample detailExample = new VmOrderDetailsExample();
 		detailExample.createCriteria().andOrderIdEqualTo(orderId).andChannelEqualTo(user.getChannel());
-		List<VmOrderDrawDetail> list = Service.lookup(IMINDataBaseService.class)
-												.getMybatisMapper(VmOrderDrawDetailMapper.class)
+		List<VmOrderDetails> list = Service.lookup(IMINDataBaseService.class)
+												.getMybatisMapper(VmOrderDetailsMapper.class)
 												.selectByExample(detailExample);
-		res.set("proState", draw.get("proState"));
-		res.set("payState", draw.get("payState"));
-		res.set("isDraw", draw.get("isDraw"));
-		res.set("fmPic", draw.get("fmPic"));
-		res.set("proName", draw.get("proName"));
 		//传递参数
 		res.set(IMINBusinessConstant.F_PAGING_LAY, list);
 		return res;