优化

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

@@ -56,15 +56,18 @@ public class DrawServiceImpl implements IDrawService {
         if(CommonUtil.isNotEmpty(payOrderId)) {
             // 支付宝的支付订单号，取后10位+34  进行计算。（加的这个数字，总后台可以更改，或者在系统里面每次随机从1-99选择一个数字加进去）
             //String suijishu = Service.lookup(IPublicService.class).getSysParValue("ZHONGJIANG_SUIJISHU");
-            VmGameRuleExample vmGameRuleExample = new VmGameRuleExample();
+           /* VmGameRuleExample vmGameRuleExample = new VmGameRuleExample();
             vmGameRuleExample.createCriteria().andTypeEqualTo("0").andMechanismEqualTo(equipmentInf.getBranchid()).andStateEqualTo("0");
             List<VmGameRule> vmGameRuleList = Service.lookup(IMINDataBaseService.class)
                                                     .getMybatisMapper(VmGameRuleMapper.class)
                                                     .selectByExample(vmGameRuleExample);
             if(vmGameRuleList.size() != 1){
                 throw new MINBusinessException("售货机没有设置汇率");
+            }*/
+            String suijishu = equipmentInf.getZfbAccount();
+            if(CommonUtil.isEmpty(suijishu)) {
+                suijishu = "0";
             }
-            String suijishu  = vmGameRuleList.get(0).getAlipayid();
             payOrderId = payOrderId.substring(payOrderId.length()-10);
             useOrderId = CommonUtil.add(payOrderId, suijishu);
             BigDecimal bigUse = new BigDecimal(useOrderId);
@@ -72,6 +75,9 @@ public class DrawServiceImpl implements IDrawService {
         }
 
         String huilv = equipmentInf.getExchangeRate();
+        if(CommonUtil.isEmpty(huilv)) {
+            huilv = "0";
+        }
 
         // 汇率百分比
         String huilvBaiFenBi = CommonUtil.divide(huilv, "100");