Merge branch 'fhx-base-治疗单改版0829' into master-test

fhx

2024-09-04 2795b4138b22b0fd556af8ba8ab5e33bfe592cc8

Merge branch 'fhx-base-治疗单改版0829' into master-test

 phi_platform_user/src/main/java/com/hx/phip/controller/treat/TreatController.java

@@ -740,10 +740,10 @@
            }

            if(StringUtils.noNull(treatProject.getUserProjectItemId())){
                idSet.add(treatProject.getUserProjectItemId());
                if(idSet.contains(treatProject.getUserProjectItemId())){
                    throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL, "治疗单选择用户项目重复！");
                }
                idSet.add(treatProject.getUserProjectItemId());
            }

            if(StringUtils.noNull(treatProject.getId())){

 phi_platform_user/src/main/java/com/hx/phip/util/api/OrderPayMoneyUtil.java

@@ -2406,10 +2406,10 @@
        values.put("orderId", orderId);
        values.put("orderItemId", orderItemId);
        if(StringUtils.isEmpty(orderItemSonId)){
            sqlSentence.setSqlSentence(" userProjectItemId = #{m.userProjectItemId} where orderId = #{m.orderId} and orderItemId = #{m.orderItemId} and userProjectItemId is null ");
            sqlSentence.setSqlSentence(" userProjectItemId = #{m.userProjectItemId}, isUserPro = 1 where orderId = #{m.orderId} and orderItemId = #{m.orderItemId} and userProjectItemId is null ");
        }else{
            values.put("orderItemSonId", orderItemSonId);
            sqlSentence.setSqlSentence(" userProjectItemId = #{m.userProjectItemId} where orderId = #{m.orderId} and orderItemId = #{m.orderItemId} and orderItemSonId = #{m.orderItemSonId} and userProjectItemId is null ");
            sqlSentence.setSqlSentence(" userProjectItemId = #{m.userProjectItemId}, isUserPro = 1 where orderId = #{m.orderId} and orderItemId = #{m.orderItemId} and orderItemSonId = #{m.orderItemSonId} and userProjectItemId is null ");
        }
        commonService.updateWhere(TreatProjectMapper.class, sqlSentence);
    }