fixed 修复客户提的一些bug、超过1000元支付、店铺创建等

fuint-application/src/main/java/com/fuint/common/service/impl/PaymentServiceImpl.java

@@ -187,7 +187,7 @@ public class PaymentServiceImpl implements PaymentService {
         orderInfo.setOrderSn(orderSn);
         orderInfo.setPayType(payType);
         orderInfo.setPlatform(platform);
-        orderService.updateOrder(orderInfo);
+        orderInfo = orderService.updateOrder(orderInfo);
 
         // 收银员操作
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
@@ -221,6 +221,7 @@ public class PaymentServiceImpl implements PaymentService {
         // 实付金额 = 总金额 - 优惠金额 - 积分金额
         BigDecimal realPayAmount = orderInfo.getAmount().subtract(new BigDecimal(orderInfo.getDiscount().toString())).subtract(new BigDecimal(orderInfo.getPointAmount().toString())).add(orderInfo.getDeliveryFee());
         Object payment = null;
+        Boolean isPaying = false;
         if (payType.equals(PayTypeEnum.BALANCE.getKey())) {
             if (orderInfo.getType().equals(OrderTypeEnum.PRESTORE.getKey()) || orderInfo.getType().equals(OrderTypeEnum.RECHARGE.getKey())) {
                 throw new BusinessCheckException("抱歉，不能使用余额支付");
@@ -267,7 +268,12 @@ public class PaymentServiceImpl implements PaymentService {
             orderInfo.setPayType(payType);
             ResponseObject paymentInfo = createPrepayOrder(mtUser, orderInfo, (pay.intValue()), authCode, 0, ip, platform, isWechat);
             if (paymentInfo.getData() == null) {
-                throw new BusinessCheckException("抱歉，支付失败");
+                if (paymentInfo.getCode() == 3000) {
+                    logger.info("需要用户输入密码..");
+                    isPaying = true;
+                } else {
+                    throw new BusinessCheckException("抱歉，支付失败");
+                }
             }
             payment = paymentInfo.getData();
         }
@@ -277,6 +283,7 @@ public class PaymentServiceImpl implements PaymentService {
         result.put("payType", payType);
         result.put("orderInfo", orderInfo);
         result.put("payment", payment);
+        result.put("isPaying", isPaying);
 
         return result;
     }

fuint-application/src/main/java/com/fuint/common/service/impl/StoreServiceImpl.java

@@ -290,9 +290,13 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
         BeanUtils.copyProperties(mtStore, mtStoreDto);
 
         if (StringUtil.isEmpty(mtStore.getQrCode())) {
-            String page = QrCodeEnum.STORE.getPage() + "?" + QrCodeEnum.STORE.getKey() + "Id = " + mtStore.getId();
-            String qr = weixinService.createQrCode(mtStore.getMerchantId(), QrCodeEnum.STORE.getKey(), mtStore.getId(), page, 320);
-            mtStoreDto.setQrCode(qr);
+            try {
+                String page = QrCodeEnum.STORE.getPage() + "?" + QrCodeEnum.STORE.getKey() + "Id = " + mtStore.getId();
+                String qr = weixinService.createQrCode(mtStore.getMerchantId(), QrCodeEnum.STORE.getKey(), mtStore.getId(), page, 320);
+                mtStoreDto.setQrCode(qr);
+            } catch (Exception e) {
+                logger.error(e.getMessage());
+            }
         }
 
         return mtStoreDto;

fuint-application/src/main/java/com/fuint/common/service/impl/WeixinServiceImpl.java

@@ -207,6 +207,7 @@ public class WeixinServiceImpl implements WeixinService {
         reqDto.setId(orderInfo.getId());
         reqDto.setPayAmount(payAmount1);
         reqDto.setPayType(orderInfo.getPayType());
+        reqDto.setOrderSn(orderInfo.getOrderSn());
         orderService.updateOrder(reqDto);
 
         Map<String, String> respData;