调整汇联支付回调

src/main/java/com/minpay/common/pay/ShouhuoPay.java

@@ -173,8 +173,7 @@ public class ShouhuoPay implements IMINAction{
 			String payChannel = Service.lookup(IPublicService.class).getSysParValue(user.getChannel() +"_PERSONALPAY_PAY_CHANNEL");
 
 			//汇联
-			if("HLZF".equals(payChannel)
-					&& !"00".equals(ordInf.getProType())) {
+			if("HLZF".equals(payChannel)) {
 				VmEquipmentInf equipmentInf = Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmEquipmentInfMapper.class).selectByPrimaryKey(ordInf.getEquipmentId());
 				if(equipmentInf == null) {
 					throw new MINBusinessException("没有找到此售货机");

src/main/java/com/minpay/common/service/IOrderService.java

@@ -16,5 +16,5 @@ public interface IOrderService extends IMINLocalService, IMINInitializer {
 	 * @return
 	 * @throws MINBusinessException
 	 */
-	public String createOrderInf(String equNo, String proType, String proState, String payType, String payNumber, String detData, MINSession session,String gameId) throws MINBusinessException;
+	public String createOrderInf(String equNo, String proType, String proState, String payType, String payNumber, String detData, MINSession session,String gameRule) throws MINBusinessException;
 }

src/main/java/com/minpay/common/service/impl/DrawServiceImpl.java

@@ -13,6 +13,7 @@ import com.startup.minpay.frame.service.base.Service;
 import com.startup.minpay.frame.target.MINComponent;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -106,15 +107,15 @@ public class DrawServiceImpl implements IDrawService {
         //开始金额
         String startAmt = drawAmountStr[0];
         //结束金额
-        String endAmt = drawAmountStr[0];
+        String endAmt = drawAmountStr[1];
 
-        List<DrawDto> drawDtoList = null;
+        List<DrawDto> drawDtoList = new ArrayList<>();
         DrawDto drawDto = new DrawDto();
         drawDto.setHuodaoNo(proEquRel.getId());
         drawDto.setOrderId(orderInf.getId());
         drawDto.setOrderDetailsId(vmOrderDetails.getDetailsId());
         //在范围内中奖
-        if(Double.parseDouble(startAmt) <= Double.parseDouble(amt) && Double.parseDouble(amt) >= Double.parseDouble(endAmt)){
+        if(Double.parseDouble(startAmt) < Double.parseDouble(amt) && Double.parseDouble(amt) < Double.parseDouble(endAmt)){
             //重置货道累计金额
             proEquRel.setAccumulatedAmount("0");
             drawDto.setDraw(true);
@@ -133,7 +134,7 @@ public class DrawServiceImpl implements IDrawService {
                 .getMybatisMapper(VmProEquRelMapper.class)
                 .updateByPrimaryKeySelective(proEquRel);
 
-
+        drawDtoList.add(drawDto);
         return drawDtoList;
     }
 

src/main/java/com/minpay/common/service/impl/OrderServiceImpl.java

@@ -38,7 +38,7 @@ public class OrderServiceImpl implements IOrderService {
 	}
 
 	@Override
-	public String createOrderInf(String equNo, String proType, String proState, String payType, String payNumber, String detData, MINSession session,String gameId) throws MINBusinessException {
+	public String createOrderInf(String equNo, String proType, String proState, String payType, String payNumber, String detData, MINSession session,String gameRule) throws MINBusinessException {
 		VmPersonInf newPerson = new VmPersonInf();
 		//获取操作员
 		User user = session.getUser();
@@ -82,7 +82,7 @@ public class OrderServiceImpl implements IOrderService {
 		ordInf.setModifyUser(user.getId());			//修改人
 		ordInf.setModifyTime(nowTime);				//修改时间
         ordInf.setBranchid(equInf.getBranchid());
-		ordInf.setGameRule(gameId);
+		ordInf.setGameRule(gameRule);
 		//定义订单总金额
 		String orderAmt = "0.00";
 		//定义订单详情初始化详情编号的flag

src/main/java/com/minpay/db/table/model/VmDeliveryInf.java

@@ -148,6 +148,14 @@ public class VmDeliveryInf extends AbstractMINBean {
     private String modifyTime;
 
     /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_BRANCHID
+     *
+     * @mbggenerated
+     */
+    private String branchid;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_delivery_inf.VDI_DELIVERY_ID
      *
@@ -578,4 +586,28 @@ public class VmDeliveryInf extends AbstractMINBean {
     public void setModifyTime(String modifyTime) {
         this.modifyTime = modifyTime == null ? null : modifyTime.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_BRANCHID
+     *
+     * @return the value of vm_delivery_inf.VDI_BRANCHID
+     *
+     * @mbggenerated
+     */
+    public String getBranchid() {
+        return branchid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_BRANCHID
+     *
+     * @param branchid the value for vm_delivery_inf.VDI_BRANCHID
+     *
+     * @mbggenerated
+     */
+    public void setBranchid(String branchid) {
+        this.branchid = branchid == null ? null : branchid.trim();
+    }
 }

src/main/java/com/minpay/db/table/model/VmDeliveryInfExample.java

@@ -1593,6 +1593,84 @@ public class VmDeliveryInfExample {
             addCriterion("VDI_MODIFY_TIME not between", value1, value2, "modifyTime");
             return (Criteria) this;
         }
+
+        public Criteria andBranchidIsNull() {
+            addCriterion("VDI_BRANCHID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidIsNotNull() {
+            addCriterion("VDI_BRANCHID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidEqualTo(String value) {
+            if(value == null ){
+                andBranchidIsNull();
+            } else {
+                addCriterion("VDI_BRANCHID =", value, "branchid");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidNotEqualTo(String value) {
+            if(value == null ){
+                andBranchidIsNotNull();
+            } else {
+                addCriterion("VDI_BRANCHID <>", value, "branchid");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidGreaterThan(String value) {
+            addCriterion("VDI_BRANCHID >", value, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidGreaterThanOrEqualTo(String value) {
+            addCriterion("VDI_BRANCHID >=", value, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidLessThan(String value) {
+            addCriterion("VDI_BRANCHID <", value, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidLessThanOrEqualTo(String value) {
+            addCriterion("VDI_BRANCHID <=", value, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidLike(String value) {
+            addCriterion("VDI_BRANCHID like", value, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidNotLike(String value) {
+            addCriterion("VDI_BRANCHID not like", value, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidIn(List<String> values) {
+            addCriterion("VDI_BRANCHID in", values, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidNotIn(List<String> values) {
+            addCriterion("VDI_BRANCHID not in", values, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidBetween(String value1, String value2) {
+            addCriterion("VDI_BRANCHID between", value1, value2, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidNotBetween(String value1, String value2) {
+            addCriterion("VDI_BRANCHID not between", value1, value2, "branchid");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/minpay/shouhuo/deliveryaction/DeliveryAction.java

@@ -1,12 +1,5 @@
 package com.minpay.shouhuo.deliveryaction;
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletResponse;
-
 import com.min.base64.Base64;
 import com.min.des.DesUtils;
 import com.min.util.OffSetUtil;
@@ -40,9 +33,14 @@ import com.startup.minpay.frame.target.MINAction;
 import com.startup.minpay.frame.target.MINComponent;
 import com.startup.minpay.frame.target.MINParam;
 import com.startup.minpay.util.Log;
-
 import net.sf.json.JSONObject;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 售货机提货相关接口
  * @author Zhumq
@@ -411,10 +409,11 @@ public class DeliveryAction implements IMINAction{
 				dlInf.setCreateTime(nowTime);				//创建时间
 				dlInf.setModifyUser(ordInf.getPersonId());	//修改人
 				dlInf.setModifyTime(nowTime);				//修改时间
+				dlInf.setBranchid(ordInf.getBranchid());
 				//执行新增提货信息
 				Service.lookup(IMINDataBaseService.class)
 						.getMybatisMapper(VmDeliveryInfMapper.class)
-						.insert(dlInf);
+						.insertSelective(dlInf);
 				//更新订单详情
 				if(ordInf.getIsDraw().equals("00")){
 					ordInf.setIsDraw("01");

src/main/java/com/minpay/shouhuo/orderaction/ShOrderManageAction.java

@@ -137,7 +137,7 @@ public class ShOrderManageAction implements IMINAction {
 			@MINParam(key = "proState")String proState,
 			@MINParam(key = "detData")String detData,
 			@MINParam(key = "payType")String payType,
-			@MINParam(key = "gameId")String gameId,
+			@MINParam(key = "gameRule")String gameRule,
 			MINSession session) throws MINBusinessException{
 		//创建返回值对象
 		MINActionResult res = new MINActionResult();
@@ -146,7 +146,7 @@ public class ShOrderManageAction implements IMINAction {
 		}
 		//解密售货机编号
 		//String equNoNew = OffSetUtil.deScanCode(equNo);
-		String orderId = Service.lookup(IOrderService.class).createOrderInf(equNo, proType, proState, payType, "", detData, session,gameId);
+		String orderId = Service.lookup(IOrderService.class).createOrderInf(equNo, proType, proState, payType, "", detData, session,gameRule);
 		//调用支付流水生产接口
 		if(!CommonUtil.isEmpty(orderId)){
 			String totalAmt = PaymentAction.addPaymentInfo(orderId, session);

src/main/resources/com/minpay/db/table/mapper/VmDeliveryInfMapper.xml

@@ -24,6 +24,7 @@
     <result column="VDI_CREATE_TIME" jdbcType="VARCHAR" property="createTime" />
     <result column="VDI_MODIFY_USER" jdbcType="VARCHAR" property="modifyUser" />
     <result column="VDI_MODIFY_TIME" jdbcType="VARCHAR" property="modifyTime" />
+    <result column="VDI_BRANCHID" jdbcType="VARCHAR" property="branchid" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -99,7 +100,7 @@
     VDI_DELIVERY_ID, VDI_CHANNEL, VDI_EQUIPMENT_ID, VDI_PERSON_ID, VDI_ORD_DET_ID, VDI_PRO_TYPE, 
     VDI_PRO_NAME, VDI_PRO_PRICE, VDI_PRO_NUMS, VDI_AMOUNT, VDI_STATUS, VDI_CARGO_WAY, 
     VDI_DELIVERY_NUMS, VDI_REMARKS, VDI_CREATE_USER, VDI_CREATE_TIME, VDI_MODIFY_USER, 
-    VDI_MODIFY_TIME
+    VDI_MODIFY_TIME, VDI_BRANCHID
   </sql>
   <select id="selectByExample" parameterType="com.minpay.db.table.model.VmDeliveryInfExample" resultMap="BaseResultMap">
     <!--
@@ -157,15 +158,15 @@
       VDI_PRO_NAME, VDI_PRO_PRICE, VDI_PRO_NUMS, 
       VDI_AMOUNT, VDI_STATUS, VDI_CARGO_WAY, 
       VDI_DELIVERY_NUMS, VDI_REMARKS, VDI_CREATE_USER, 
-      VDI_CREATE_TIME, VDI_MODIFY_USER, VDI_MODIFY_TIME
-      )
+      VDI_CREATE_TIME, VDI_MODIFY_USER, VDI_MODIFY_TIME, 
+      VDI_BRANCHID)
     values (#{deliveryId,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{equipmentId,jdbcType=VARCHAR}, 
       #{personId,jdbcType=VARCHAR}, #{ordDetId,jdbcType=VARCHAR}, #{proType,jdbcType=VARCHAR}, 
       #{proName,jdbcType=VARCHAR}, #{proPrice,jdbcType=VARCHAR}, #{proNums,jdbcType=VARCHAR}, 
       #{amount,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{cargoWay,jdbcType=VARCHAR}, 
       #{deliveryNums,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=VARCHAR}, #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR}
-      )
+      #{createTime,jdbcType=VARCHAR}, #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR}, 
+      #{branchid,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmDeliveryInf">
     <!--
@@ -228,6 +229,9 @@
       <if test="modifyTime != null">
         VDI_MODIFY_TIME,
       </if>
+      <if test="branchid != null">
+        VDI_BRANCHID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="deliveryId != null">
@@ -284,6 +288,9 @@
       <if test="modifyTime != null">
         #{modifyTime,jdbcType=VARCHAR},
       </if>
+      <if test="branchid != null">
+        #{branchid,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.minpay.db.table.model.VmDeliveryInfExample" resultType="java.lang.Integer">
@@ -357,6 +364,9 @@
       <if test="record.modifyTime != null">
         VDI_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
       </if>
+      <if test="record.branchid != null">
+        VDI_BRANCHID = #{record.branchid,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -385,7 +395,8 @@
       VDI_CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
       VDI_CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
       VDI_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
-      VDI_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR}
+      VDI_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
+      VDI_BRANCHID = #{record.branchid,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -448,6 +459,9 @@
       <if test="modifyTime != null">
         VDI_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
       </if>
+      <if test="branchid != null">
+        VDI_BRANCHID = #{branchid,jdbcType=VARCHAR},
+      </if>
     </set>
     where VDI_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR}
   </update>
@@ -473,7 +487,8 @@
       VDI_CREATE_USER = #{createUser,jdbcType=VARCHAR},
       VDI_CREATE_TIME = #{createTime,jdbcType=VARCHAR},
       VDI_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},
-      VDI_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR}
+      VDI_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
+      VDI_BRANCHID = #{branchid,jdbcType=VARCHAR}
     where VDI_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR}
   </update>
 </mapper>