fix:充值

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TOrderController.java

@@ -7,6 +7,8 @@ import com.ylx.common.core.domain.R;
 import com.ylx.common.enums.BusinessType;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.common.utils.StringUtils;
+import com.ylx.common.utils.poi.ExcelUtil;
+import com.ylx.massage.domain.MaTechnician;
 import com.ylx.massage.domain.TOrder;
 import com.ylx.massage.enums.Enumproject;
 import com.ylx.massage.enums.OrderStatusEnum;
@@ -22,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -251,6 +254,15 @@ public class TOrderController {
         return R.ok(all);
     }
 
+    @Log(title = "微信获取订单信息", businessType = BusinessType.EXPORT)
+    @ApiOperation("导出")
+    @RequestMapping(value = "wx/export", method = RequestMethod.GET)
+    public void export(HttpServletResponse response, Page<TOrder> page, TOrder param) {
+        Page<TOrder> all = orderService.getAll(page, param);
+        ExcelUtil<TOrder> util = new ExcelUtil<TOrder>(TOrder.class);
+        util.exportExcel(response, all.getRecords(), "订单");
+    }
+
     /**
      * 分页查询数据
      */

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TRecharge.java

@@ -50,6 +50,13 @@ public class TRecharge implements Serializable {
     @ApiModelProperty("充值单号")
     private String rechargeNo;
 
+    /**
+     * 技师ID
+     */
+    @TableField("js_id")
+    @ApiModelProperty("技师ID")
+    private String jsId;
+
     /**
      * 金额
      */

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TRechargeServiceImpl.java

@@ -86,13 +86,13 @@ public class TRechargeServiceImpl extends ServiceImpl<TRechargeMapper, TRecharge
         if (null == recharge.getdMoney() || recharge.getdMoney().compareTo(BigDecimal.ZERO) <= 0) {
             throw new ServiceException("充值金额不能为空");
         }
-        LambdaQueryWrapper<TRecharge> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TRecharge::getcOpenId, recharge.getcOpenId()).eq(TRecharge::getPayStatus, -1).eq(TRecharge::getdMoney, recharge.getdMoney());
-        TRecharge one = getOne(queryWrapper);
-        if (one != null) {
-            log.info("未支付的充值记录,{}",one.getRechargeNo());
-            return one;
-        }
+//        LambdaQueryWrapper<TRecharge> queryWrapper = new LambdaQueryWrapper<>();
+//        queryWrapper.eq(TRecharge::getcOpenId, recharge.getcOpenId()).eq(TRecharge::getPayStatus, -1).eq(TRecharge::getdMoney, recharge.getdMoney());
+//        TRecharge one = getOne(queryWrapper);
+//        if (one != null) {
+//            log.info("未支付的充值记录,{}",one.getRechargeNo());
+//            return one;
+//        }
         recharge.setRechargeNo(generator.generateNextOrderNumber(OrderNumberGenerator.KEY_PREFIX_RECHAR));
         recharge.setDtCreateTime(LocalDateTime.now());
         save(recharge);