套餐订单

src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java

@@ -392,7 +392,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         orders.setEntryName(massageTypeName);
 
         //判断金额是否满足代金券金额最少消费额度
-        if(payMoney.compareTo(couponMinMoney) < 0){
+        if(price.compareTo(couponMinMoney) < 0){
             return Result.error("当前应付总金额不满足优惠券使用的最小额度，请重新选择优惠券！");
         }
 
@@ -3852,12 +3852,21 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         for (Orders orders : records) {
             List<OrdersMassage> ordersMassageList = ordersMassageService.list(new QueryWrapper<OrdersMassage>().eq("orders_id", orders.getOrdersId()));
             for (OrdersMassage ordersMassage : ordersMassageList) {
-                MassageType massageType = massageTypeService.getById(ordersMassage.getMassageId());
+                if(orders.getUserPackageDetailId() !=null){
-                ordersMassage.setMassageType(massageType);
+                    UserPackageDetail userPackageDetail = userPackageDetailService.getById(ordersMassage.getMassageId());
-                if (massageType != null) {
+                    UserPackage userPackage = userPackageService.getById(userPackageDetail.getMainId());
-                    SysDictEntity sysDictEntity = sysDictService.getById(massageType.getClassifyId());
+                    orders.setPackageType(userPackage.getType());
-                    if (sysDictEntity != null) {
+                    userPackageDetail.setMainTitle(userPackage.getTitle());
-                        massageType.setClassifyName(sysDictEntity.getValue());
+                    userPackageDetail.setMainPrice(userPackage.getPrice());
+                    ordersMassage.setUserPackageDetail(userPackageDetail);
+                }else{
+                    MassageType massageType = massageTypeService.getById(ordersMassage.getMassageId());
+                    ordersMassage.setMassageType(massageType);
+                    if (massageType != null) {
+                        SysDictEntity sysDictEntity = sysDictService.getById(massageType.getClassifyId());
+                        if (sysDictEntity != null) {
+                            massageType.setClassifyName(sysDictEntity.getValue());
+                        }
                     }
                 }
             }
@@ -4851,6 +4860,8 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
     @Override
     public Result accomplishOrders(Long ordersId, Integer type, String accomplishLongitude, String accomplishLatitude,String jsFwcn,String  jsPjtag,String jsTsbz,String earlyFinishReason) {
         reentrantReadWriteLock.writeLock().lock();
+        log.error("accomplishOrders:4881:"+accomplishLongitude);
+        log.error("accomplishOrders:4881:"+accomplishLatitude);
         try {
             Orders orders = baseMapper.selectById(ordersId);
             if (StringUtil.isEmpty(accomplishLatitude)) {
@@ -4872,6 +4883,8 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 GlobalCoordinates target = new GlobalCoordinates(Double.parseDouble(accomplishLatitude), Double.parseDouble(accomplishLongitude));
                 Integer distances = (int) LonLatUtil.getDistanceMeter(source, target, Ellipsoid.Sphere);
                 String value = commonInfoService.findOne(373).getValue();
+                log.error("accomplishOrders:4881:"+distances);
+                log.error("accomplishOrders:4881:"+value);
                 if (distances < Integer.parseInt(value)) {
                     return Result.error("请离开当前位置" + value + "m后点击完成！");
                 }

src/main/java/com/sqx/modules/bl/massage/entity/MassagePackage.java

@@ -118,6 +118,12 @@ public class MassagePackage implements Serializable {
     @TableField(exist = false)
     private String typeName;
 
+    /**
+     * 服务次数
+     */
+    @TableField(exist = false)
+    private Integer serviceCount;
+
     /**
      * 分类标识
      */

src/main/resources/mapper/bl/massage/MassagePackageDao.xml

@@ -4,7 +4,12 @@
 <mapper namespace="com.sqx.modules.bl.massage.dao.MassagePackageDao">
 
     <select id="findPage" resultType="com.sqx.modules.bl.massage.entity.MassagePackage">
-        select *
+        select m.*,
+        (
+            select sum(service_count) from bl_massage_package_detail d
+            inner join massage_type t on t.massage_type_id = d.massage_type_id and t.status = 1
+            where d.main_id = m.id
+        ) as service_count
         from bl_massage_package m
         where 1=1
         <if test="params.status!=null and params.status!=0">

src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml

@@ -19,7 +19,8 @@
             b.status,
             b.classify_id as type,
             b.jianjie,
-            b.apply_people
+            b.apply_people,
+            concat(round(interval_days),'天一疗程，每隔',round(interval_days),'天一次，共',round(service_count),'次') as interval_days_str
         from bl_massage_package_detail a inner join massage_type b on a.massage_type_id = b.massage_type_id
         where a.main_id = #{params.mainId}
         <if test="params.status!=null and params.status!=0">