Merge remote-tracking branch 'origin/master'

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/DetailServiceImpl.java

@@ -322,6 +322,15 @@ public class DetailServiceImpl implements IDetailService {
 
         }
         if(!collect.isEmpty()){
+            collect.forEach(theGymnasiumIsCharteredInfoVO -> {
+                AppSitePriceRules appSitePriceRules = appSitePriceRulesMapper.selectById(theGymnasiumIsCharteredInfoVO.getId());
+                theGymnasiumIsCharteredInfoVO.setSellingPrice(appSitePriceRulesMapper.selectOne(Wrappers.<AppSitePriceRules>lambdaQuery()
+                        .eq(AppSitePriceRules::getOrgCode, appSitePriceRules.getOrgCode())
+                        .eq(AppSitePriceRules::getCategoryId, categoryId)
+                        .eq(AppSitePriceRules::getDayOfWeek, appSitePriceRules.getDayOfWeek())
+                        .orderByAsc(AppSitePriceRules::getSellingPrice).last("LIMIT 1"))
+                        .getSellingPrice());
+            });
             theGymnasiumIsCharteredVO.setVr(appSiteMapper.selectById(id).getVr());
         }
         theGymnasiumIsCharteredVO.setTimeSlot(collect);

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/EvaluateMapper.xml

@@ -52,7 +52,20 @@
     <select id="findByCoursesId"
             resultType="org.jeecg.modules.system.app.dto.evaluate.FindEvaluateResponseDTO">
         select ne.id,
-               ne.score,ne.evaluate_content,su.avatar,ne.images,ne.check_status,ne.reply_status,ne.reply_content,ne.reply_time,ne.type,ne.create_time,sd.depart_name,su.username,su.phone
+               ne.score,
+               ne.evaluate_content,
+               su.avatar,
+               ne.images,
+               ne.check_status,
+               ne.reply_status,
+               ne.reply_content,
+               ne.reply_time,
+               ne.type,
+               ne.create_time,
+               sd.depart_name,
+               su.username,
+               su.phone,
+               ne.is_anonymous
         from nm_evaluate ne
         left join  sys_depart sd on  ne.dept_id = sd.id
         LEFT JOIN sys_user su on  ne.user_id =su.id

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppSiteServiceImpl.java

@@ -192,8 +192,13 @@ public class AppSiteServiceImpl extends ServiceImpl<AppSiteMapper, AppSite> impl
     public Boolean editSitePayInfo(EditSitePayInfoDTO editSitePayInfoDTO) {
         SysDepart sysDepart = sysDepartMapper.selectById(editSitePayInfoDTO.getSiteId());
         if(null == sysDepart) throw new JeecgBootException("商户部门不存在", SC_INTERNAL_SERVER_ERROR_500);
+        // 转换括号
+        String mchName = editSitePayInfoDTO.getMchName();
+        if (mchName != null) {
+            mchName = mchName.replace("(", "（").replace(")", "）");
+        }
         sysDepart.setMchId(editSitePayInfoDTO.getMchId());
-        sysDepart.setMchName(editSitePayInfoDTO.getMchName());
+        sysDepart.setMchName(mchName);
         sysDepart.setOrgIdCardNum(editSitePayInfoDTO.getOrgIdCardNum());
         sysDepart.setAppid(WechatConstants.WECHAT_SUB_APPID);
         return sysDepartMapper.updateById(sysDepart) > 0;
@@ -203,9 +208,14 @@ public class AppSiteServiceImpl extends ServiceImpl<AppSiteMapper, AppSite> impl
     public EditSitePayInfoDTO querySitePayInfoById(String id) {
         EditSitePayInfoDTO editSitePayInfoDTO = new EditSitePayInfoDTO();
         SysDepart sysDepart = sysDepartMapper.selectById(id);
+        // 转换括号
+        String mchName = editSitePayInfoDTO.getMchName();
+        if (mchName != null) {
+            mchName = mchName.replace("(", "（").replace(")", "）");
+        }
         editSitePayInfoDTO.setSiteId(sysDepart.getId())
                 .setMchId(sysDepart.getMchId())
-                .setMchName(sysDepart.getMchName())
+                .setMchName(mchName)
                 .setOrgIdCardNum(sysDepart.getOrgIdCardNum());
         return editSitePayInfoDTO;
     }