Browse Source

bug修复

mengkang 4 năm trước cách đây
mục cha
commit
86032e82ed

+ 1 - 1
business/base-service/src/main/java/com/yihu/jw/hospital/ykyy/service/YkyyService.java

@ -113,7 +113,7 @@ public class YkyyService {
     * @param type  类型0 就诊卡号 1 门诊卡号
     * @return
     */
    public String UpRecharge4Jkzl(String guid,Integer jkje,Integer type){
    public String upRecharge4Jkzl(String guid,Integer jkje,Integer type){
        String response="";
        Map<String, String> map = new HashMap<>();
        map.put("guid",guid);

+ 15 - 1
business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@ -627,6 +627,7 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
        if("SUCCESS".equals(wxrs.get("return_code").toString())){
            // 我方 订单号+时间差
            String seqNo = wxrs.get("out_trade_no")+"";
            String totalFee=wxrs.get("total_fee")+"";
            // 微信充值流水号
            String wxSeqNo = wxrs.get("transaction_id")+"";
            // 微信分配的终端设备号
@ -661,9 +662,22 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                            e.printStackTrace();
                        }
                    }
                }else if (businessOrderDO!=null&&businessOrderDO.getOrderCategory().equalsIgnoreCase("5")){
                    String price = Integer.parseInt(totalFee)/100+"";
                    if (businessOrderDO.getOrderType()==10){
                        ykyyService.upRecharge4Jkzl(seqNo,Integer.parseInt(price),0);
                    }
                    if (businessOrderDO.getOrderType()==11){
                        ykyyService.upRecharge4Jkzl(seqNo,Integer.parseInt(price),1);
                    }
                }
            }
            ykyyService.updateYktOrderStatus(businessOrderDO.getOrderNo(),businessOrderDO.getStatus().toString());
            else if (businessOrderDO!=null&&!businessOrderDO.getOrderCategory().equalsIgnoreCase("5")){
                ykyyService.updateYktOrderStatus(businessOrderDO.getOrderNo(),businessOrderDO.getStatus().toString());
            }
            //操作微信日志表记录
            List<WxPayLogDO> wxPayLogDOs = wxPayLogDao.findBySeqNo(seqNo);
            WxPayLogDO wxPayLogDO = wxPayLogDOs.get(0);

+ 0 - 2
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@ -379,8 +379,6 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                    prescriptionVO.setInfoVOs(wlyyPrescriptionInfoVOS);
                    prescriptionVO.setPayStatus(1);
                    imService.pushPrescriptionImMessage(prescriptionVO);
                }else if (businessOrderDO!=null&&businessOrderDO.getOrderCategory().equalsIgnoreCase("5")){
                }
            }
        }