From aa33bb96ba9f14b16c6c7832e21bfbd88983ba6d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 24 一月 2024 18:02:39 +0800
Subject: [PATCH] zjh 2024/01/24--3

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |  228 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 117 insertions(+), 111 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 590d55c..93442c0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -348,9 +348,12 @@
                     for (TjOrder order : list) {
                         TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
                         if (null != tjCustomer) {
-                            order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
-                            order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
-                            order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+//                            order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+                            order.setTjCustomerName(tjCustomer.getCusName());
+//                            order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
+                            order.setTjCustomerPhone(tjCustomer.getCusPhone());
+//                            order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+                            order.setTjCusIdCard(tjCustomer.getCusIdcard());
                             order.setTjCustomerSex(tjCustomer.getCusSex());
                             order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
                             order.setCareer(tjCustomer.getCareer());
@@ -404,8 +407,10 @@
                     order.setTjCustomerSex(tjCustomer.getCusSex());
                     order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
                     order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+                    order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
                     order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
-                    order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+//                    order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+                    order.setTjCusIdCard(tjCustomer.getCusIdcard());
                     order.setCareer(tjCustomer.getCareer());
                     order.setIdType(tjCustomer.getIdType());
                     order.setAgeUnit(tjCustomer.getAgeUnit());
@@ -791,22 +796,28 @@
      */
     @PostMapping
     @ApiOperation(value = "浣撴绛惧埌鐧昏鎺ュ彛")
-    //@Transactional  (鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
+    @Transactional  //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
     public AjaxResult addOrderAndDetail(@RequestBody TjOrder tjOrder) throws Exception {
         Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
         SysUser sysUser = userService.getById(userId);
+
+        LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
+        wq.eq(TjCustomer::getCusId, tjOrder.getUserId());
+        TjCustomer tjCustomer = tjCustomerService.getOne(wq);
+        if (tjCustomer == null) return AjaxResult.error("璇ュ鎴锋湭鐧昏鎴栦笉瀛樺湪");
+
         LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
         wqq.eq(TjOrder::getUserId, tjOrder.getUserId());
         wqq.eq(TjOrder::getCheckStatus, 0);
         wqq.isNull(TjOrder::getFinishTime);
+        if(!tjCustomer.getCardId().equals("0")){
+            wqq.eq(TjOrder::getCardId,tjCustomer.getCardId());
+        }
         TjOrder order = tjOrderService.getOne(wqq);
         if (null != order) {
+            transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(),tjCustomer.getCardId());
             return AjaxResult.error("涓嶅彲閲嶅鐧昏");
         }
-        LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
-        wq.eq(TjCustomer::getCusId, tjOrder.getUserId());
-        TjCustomer tjCustomer = tjCustomerService.getOne(wq);
-        if (tjCustomer == null) return AjaxResult.error("璇ュ鎴锋湭绛惧埌鎴栦笉瀛樺湪");
         LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
         wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
         wq1.eq(TjReservation::getIsExpire, 2);
@@ -827,6 +838,7 @@
             if (null != tjReservation.getDepartment()) tjOrder.setFirmDeptName(tjReservation.getDepartment());
             if (null != tjReservation.getJobNo()) tjOrder.setFirmWorkId(tjReservation.getJobNo());
             if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId());
+            if (null != tjReservation.getTjCategory()) tjOrder.setTjCategory(tjReservation.getTjCategory());
             if (null != tjReservation.getGroupingId()){
                 tjOrder.setGroupId(tjReservation.getGroupingId());
                 tjOrder.setFirmDeptId(tjReservation.getPacId());
@@ -864,6 +876,7 @@
         //鍒ゆ柇灏忕▼搴忎笂棰勭害鏄惁浠橀挶
         if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId()));
         tjOrder.setStatus(TjConstants.TJ_BEGIN);
+        tjOrder.setCardId(tjCustomer.getCardId());
         if (tjOrderService.save(tjOrder)) {
             //淇濆瓨鏀惰揣鍦板潃
             if ("2".equals(tjOrder.getGetType())){
@@ -876,9 +889,9 @@
             Long cusNumber = tjCustomer.getCusNumber();
             cusNumber += 1;
             tjCustomer.setCusNumber(cusNumber);
-            tjCustomerService.updateById(tjCustomer);
             BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount())).divide(BigDecimal.valueOf(10));
             TjFlowingWater tjFlowingWater = new TjFlowingWater();
+            tjFlowingWater.setPayStasus(0L);
             if ("1".equals(tjOrder.getTjType())) {
                 if (null != tjReservation && tjReservation.getPayType() == 1) {
                     tjFlowingWater.setPayStasus(3L);
@@ -888,66 +901,44 @@
             //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
             //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
             final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
+            final String isPay = configService.selectConfigByKey("isPay");
             if ("Y".equals(getInfoFromSqlData)){
-
-                //鏌ヨ鏄惁his宸叉敹璐�  鑻ユ敹璐瑰垯灏嗘祦姘磋〃鏀惰垂鐘舵�佹敼鎴愬凡鏀惰垂
-                LambdaQueryWrapper<LtkjMiddleHead> middleHeadLambdaQueryWrapper =new LambdaQueryWrapper<>();
-                middleHeadLambdaQueryWrapper.eq(LtkjMiddleHead::getPatId,tjCustomer.getCusIdcard());
-                middleHeadLambdaQueryWrapper.eq(LtkjMiddleHead::getIsCanceled,"N");
-                middleHeadLambdaQueryWrapper.eq(LtkjMiddleHead::getIsChg,"Y");
-                LtkjMiddleHead middleHead = headService.getOne(middleHeadLambdaQueryWrapper);
+                LtkjMiddleHead middleHead = headService.getMiddleHeadByPartId(tjCustomer.getCardId());
                 if(null !=middleHead){
                     tjFlowingWater.setPayStasus(1L);
                 }
-                List<LtkjMiddleHead> one = testMapper.saveMiddleHeadByPatId(tjCustomer.getCusIdcard());
-                if (one!=null){
-                    for (LtkjMiddleHead ltkjMiddleHead : one) {
-                        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-                        headService.save(ltkjMiddleHead);
-                        DynamicDataSourceContextHolder.clearDataSourceType();
-                        List<LtkjMiddleDetail> detailList = testMapper.getMiddleDetailByHeadId(ltkjMiddleHead.getFeadId());
-                        if (detailList!=null){
-                            for (LtkjMiddleDetail ltkjMiddleDetail : detailList) {
-                                DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-                                middleDetailService.save(ltkjMiddleDetail);
-                                DynamicDataSourceContextHolder.clearDataSourceType();
-                            }
-                        }
-                    }
-
-                }
             }
-
-
             tjFlowingWater.setOrderId(tjOrder.getOrderId());
             Date date1 = new Date(System.currentTimeMillis());
             String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
-            tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName().toUpperCase(), "") + s1);
-            if (null != mallOrder) {
-                if (mallOrder.getOrderStatus().equals(201L)) {
-                    tjFlowingWater.setCopeWith(mallOrder.getActualPrice());
-                    tjFlowingWater.setPaidIn(mallOrder.getActualPrice());
-                    tjFlowingWater.setDiscount(String.valueOf(1));
-                    tjFlowingWater.setPayStasus(1L);
-                    tjFlowingWater.setPayType(3L);
-                    MallCheckLog checkLog = new MallCheckLog();
-                    checkLog.setCheckBy(sysUser.getNickName());
-                    checkLog.setUserId(mallOrder.getUserId());
-                    checkLog.setConsignee(mallOrder.getConsignee());
-                    checkLog.setIdCard(mallOrder.getIdCard());
-                    checkLog.setOrderId(String.valueOf(mallOrder.getId()));
-                    checkLog.setOrderSn(mallOrder.getOrderSn());
-                    checkLog.setCheckTime(new Date());
-                    checkLog.setShipSn("HX" + s1);
-                    mallCheckLogService.save(checkLog);
-                    mallOrder.setOrderStatus(301L);
-                    mallOrderService.updateById(mallOrder);
+            tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "").toUpperCase() + s1);
+            if(isPay.equals("true")){
+                if (null != mallOrder) {
+                    if (mallOrder.getOrderStatus().equals(201L)) {
+                        tjFlowingWater.setCopeWith(mallOrder.getActualPrice());
+                        tjFlowingWater.setPaidIn(mallOrder.getActualPrice());
+                        tjFlowingWater.setDiscount(String.valueOf(1));
+                        tjFlowingWater.setPayStasus(1L);
+                        tjFlowingWater.setPayType(3L);
+                        MallCheckLog checkLog = new MallCheckLog();
+                        checkLog.setCheckBy(sysUser.getNickName());
+                        checkLog.setUserId(mallOrder.getUserId());
+                        checkLog.setConsignee(mallOrder.getConsignee());
+                        checkLog.setIdCard(mallOrder.getIdCard());
+                        checkLog.setOrderId(String.valueOf(mallOrder.getId()));
+                        checkLog.setOrderSn(mallOrder.getOrderSn());
+                        checkLog.setCheckTime(new Date());
+                        checkLog.setShipSn("HX" + s1);
+                        mallCheckLogService.save(checkLog);
+                        mallOrder.setOrderStatus(301L);
+                        mallOrderService.updateById(mallOrder);
+                    }
+                } else {
+                    tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
+                    tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
+                    tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
+//                    tjFlowingWater.setPayStasus(0L);
                 }
-            } else {
-                tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
-                tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
-                tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
-                tjFlowingWater.setPayStasus(0L);
             }
             if (tjFlowingWaterService.save(tjFlowingWater)) {
                 tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
@@ -963,7 +954,7 @@
             //涓汉
             if ("2".equals(tjOrder.getTjType())) {
 
-//                asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+                //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
                 newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
             }
 
@@ -989,7 +980,8 @@
 //
 //                }
 //            }
-
+            tjCustomer.setCardId("0");
+            tjCustomerService.updateById(tjCustomer);
             return AjaxResult.success(tjNumber);
         }
         return AjaxResult.error();
@@ -1052,28 +1044,36 @@
         if (null != proIds1 && !proIds1.equals("")) {
             proIds = JSON.parseArray(proIds1.toString(), Long.class);
         }
+        TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusId);
+        String cardId ="0";
+        if(null !=tjCustomer){
+             cardId = tjCustomer.getCardId();
+        }
         if ((null == proIds || proIds.size() == 0) && (null == packId || packId.equals(""))) {
             transitionService.deletedTbTransitionByCusId(cusId);
-            if (redisCache.hasKey(cusId)) redisCache.deleteObject(cusId);
-            if (redisCache.hasKey(cusId + "cusId")) redisCache.deleteCacheMapValue(cusId + "cusId", cusId);
-
+            if (redisCache.hasKey(cardId+cusId)) {
+                redisCache.deleteObject(cardId+cusId);
+            }
+            if (redisCache.hasKey(cardId+cusId + "cusId")){
+                redisCache.deleteCacheMapValue(cardId+cusId + "cusId", cardId+cusId);
+            }
         }
         List<TbTransition> tbTransitionList = null;
-        if (!redisCache.hasKey(cusId)) {
+        if (!redisCache.hasKey(cardId+cusId)) {
             tbTransitionList = new ArrayList<>();
         } else {
-            tbTransitionList = redisCache.getCacheList(cusId);
+            tbTransitionList = redisCache.getCacheList(cardId+cusId);
         }
         //濂楅
         if (null != packId && !packId.equals("")) {
             Long pacId = Long.valueOf(packId.toString());
             List<TbTransition> list = transitionService.getTbTransitionListByCusIdAndPac(cusId, String.valueOf(pacId));
             if (null == list || list.size() == 0) {
-                transitionService.deletedTbTransitionListByCusIdAndPac(cusId);
-                if (redisCache.hasKey(cusId + "cusId")) redisCache.deleteCacheMapValue(cusId + "cusId", cusId);
-                if (redisCache.hasKey(cusId)) {
+                transitionService.deletedTbTransitionListByCusIdAndPac(cusId,cardId);
+                if (redisCache.hasKey(cardId+cusId + "cusId")) redisCache.deleteCacheMapValue(cardId+cusId + "cusId", cardId+cusId);
+                if (redisCache.hasKey(cardId+cusId)) {
                     tbTransitionList = new ArrayList<>();
-                    redisCache.deleteObject(cusId);
+                    redisCache.deleteObject(cardId+cusId);
                 }
                 List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
                 if (null != ppList && ppList.size() > 0) {
@@ -1163,13 +1163,13 @@
             }
         }
         if (null != tbTransitionList && tbTransitionList.size() > 0) {
-            if (redisCache.hasKey(cusId)) {
-                redisCache.deleteObject(cusId);
-                redisCache.setCacheList(cusId, tbTransitionList);
-                redisCache.setCacheMapValue(cusId + "cusId", cusId, getMaps(cusId));
+            if (redisCache.hasKey(cardId+cusId)) {
+                redisCache.deleteObject(cardId+cusId);
+                redisCache.setCacheList(cardId+cusId, tbTransitionList);
+                redisCache.setCacheMapValue(cardId+cusId + "cusId", cardId+cusId, getMaps(cusId,cardId));
             } else {
-                redisCache.setCacheList(cusId, tbTransitionList);
-                redisCache.setCacheMapValue(cusId + "cusId", cusId, getMaps(cusId));
+                redisCache.setCacheList(cardId+cusId, tbTransitionList);
+                redisCache.setCacheMapValue(cardId+cusId + "cusId", cardId+cusId, getMaps(cusId,cardId));
             }
         }
         return AjaxResult.success();
@@ -1183,7 +1183,12 @@
             List<Map<String, Object>> list = redisCache.getCacheMapValue(cusId + "cusId", cusId);
             return AjaxResult.success(list);
         }
-        List<Map<String, Object>> list = getMaps(cusId);
+        TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusId);
+        String cardId ="0";
+        if(null !=tjCustomer){
+            cardId = tjCustomer.getCardId();
+        }
+        List<Map<String, Object>> list = getMaps(cusId,cardId);
         return AjaxResult.success(list);
     }
 
@@ -1316,6 +1321,9 @@
             for (TjOrderRemark remark : remarkList) {
                 TjProject project = projectService.getTjProjectById(String.valueOf(remark.getProId()));
                 if (null != project) {
+                    if ("N".equals(project.getNeedReport())){
+                        continue;
+                    }
                     remark.setProCheckType(project.getProCheckType());
                     remark.setProName(project.getProName());
                 }
@@ -1417,13 +1425,13 @@
     }
 
 
-    private List<Map<String, Object>> getMaps(String cusId) {
+    private List<Map<String, Object>> getMaps(String cusId,String cardId) {
 
         List<TbTransition> transitionList = null;
-        if (redisCache.hasKey(cusId)) {
-            transitionList = redisCache.getCacheList(cusId);
+        if (redisCache.hasKey(cardId+cusId)) {
+            transitionList = redisCache.getCacheList(cardId+cusId);
         } else {
-            transitionList = transitionService.getTbTransitionListByCusId(cusId);
+            transitionList = transitionService.getTbTransitionListByCusId(cusId,cardId);
         }
         if (null == transitionList) return null;
         Map<Long, List<TbTransition>> collect = transitionList.stream().collect(Collectors.groupingBy(TbTransition::getParentProId));
@@ -1434,35 +1442,33 @@
             if (null != pacId) {
                 TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
                 map.put("pacName", aPackage.getPacName());
+                TjProject tjProject = projectService.getById(entry.getKey());
+                TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
+                        .eq(TjPackageProject::getProId, entry.getKey()));
+                map.put("ordPrice",tjProject.getProPrice());
+                if(null !=project){
+                    map.put("nowPrice",project.getPriceNow());
+                }else {
+                    map.put("nowPrice",tjProject.getProPrice());
+                }
             } else {
                 map.put("pacName", "鍗曢」");
+                List<TbTransition> tbTransitionList = entry.getValue();
+                if (null != tbTransitionList && tbTransitionList.size() > 0) {
+                    BigDecimal money1 = new BigDecimal("0.00");
+                    BigDecimal money2 = new BigDecimal("0.00");
+                    for (TbTransition tbTransition : tbTransitionList) {
+                        money1 = money1.add(tbTransition.getOrdPrice());
+                        money2 = money2.add(tbTransition.getNowPrice());
+                    }
+                    map.put("ordPrice", money1);
+                    map.put("nowPrice", money2);
+                 }
             }
             map.put("parentName", projectService.getById(entry.getKey()).getProName());
             map.put("list", entry.getValue());
-            List<TbTransition> tbTransitionList = entry.getValue();
-            if (null != tbTransitionList && tbTransitionList.size() > 0) {
-                BigDecimal money1 = new BigDecimal("0.00");
-                BigDecimal money2 = new BigDecimal("0.00");
-                for (TbTransition tbTransition : tbTransitionList) {
-                    money1 = money1.add(tbTransition.getOrdPrice());
-                    money2 = money2.add(tbTransition.getNowPrice());
-//                    if (tbTransition.getOrdPrice().compareTo(BigDecimal.valueOf(0)) == 0 || tbTransition.getNowPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
-//                        tbTransition.setDiscount("0");
-//                    } else {
-//                        tbTransition.setDiscount((tbTransition.getNowPrice()).divide(tbTransition.getOrdPrice(), BigDecimal.ROUND_CEILING).toString());
-//                    }
-//                    if (null != tbTransition.getPacId()) {
-//                        tbTransition.setPacPrice(tjPackageService.getById(tbTransition.getPacId()).getPrice());
-//                    }
-//                    if (null != tbTransition.getParentProId()) {
-//                        tbTransition.setPacPrice(projectService.getTjProjectById(String.valueOf(tbTransition.getParentProId())).getProPrice());
-//                    }
-                }
-//                map.put("ordPrice", money1.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
-//                map.put("nowPrice", money2.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
-                map.put("ordPrice", money1);
-                map.put("nowPrice", money2);
-            }
+
+
             list.add(map);
         }
         return list;
@@ -1680,11 +1686,11 @@
     }
 
     public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
-        long l = System.currentTimeMillis();
         tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
         tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
-        //淇敼姣忛」鐨勫師浠风幇浠�
-        transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount);
+        tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(),tjOrder.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+        //淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
+        transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount,tjOrder.getTjNumber());
         //娣诲姞remark琛ㄦ暟鎹�
         remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
         //鍒ゆ柇鏄惁浜ら挶
@@ -1694,7 +1700,7 @@
                         sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
             }
         }
-        if (tjFlowingWater.getPayStasus() == 1) {
+        if (tjFlowingWater.getPayStasus() == 1L) {
             tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
                     sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
         }

--
Gitblit v1.8.0