Procházet zdrojové kódy

fix: "改一下status的字段类型"

Ritchie před 2 roky
rodič
revize
b67d116701

+ 4 - 4
src/main/java/com/szwl/controller/TCoinOrderController.java

@@ -39,11 +39,11 @@ import java.util.List;
 
 /**
  * <p>
- * 前端控制器
+ *  前端控制器
  * </p>
  *
  * @author wuhs
- * @since 2023-08-23
+ * @since 2023-08-29
  */
 @RestController
 @RequestMapping("/tCoinOrder")
@@ -116,8 +116,8 @@ public class TCoinOrderController {
         coinOrder.setPrice(price);
         coinOrder.setProductNo(coinOrderVO.getNo());
         coinOrder.setSn(sn);
-        coinOrder.setStatus("1"); // 线下纸币器订单都是已付款
-        coinOrder.setIsAir("0"); // 非空中云汇
+        coinOrder.setStatus(1); // 线下纸币器订单都是已付款
+        coinOrder.setIsAir("0"); // 0或null 非空中云汇
 //        // 设备类型0或null是棉花糖,1是爆米花
 //        if ("1".equals(machineType)) {
 //            coinOrder.setMachineType("1");

+ 1 - 1
src/main/java/com/szwl/controller/TOrderController.java

@@ -85,7 +85,7 @@ public class TOrderController {
     public ResponseModel<IPage<?>> pageOrder(String equipmentId, String adminId, String adminType,
                                              String type, String sn, String status, String userName,
                                              String payType, String productNo, String clientId,
-                                             String trxNo, String dateType, String startDate, String companyType, String machineType, String endDate, long current, long size, String isAir) {
+                                             String trxNo, String dateType, String startDate, String companyType, String machineType, String endDate, long current, long size) {
         //判断当前账号状态
         TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(adminId));
         if (StringUtils.isEmpty(type)) {

+ 1 - 1
src/main/java/com/szwl/mapper/TCoinOrderMapper.java

@@ -15,7 +15,7 @@ import java.util.List;
  * </p>
  *
  * @author wuhs
- * @since 2023-08-23
+ * @since 2023-08-29
  */
 public interface TCoinOrderMapper extends BaseMapper<TCoinOrder> {
 

+ 2 - 2
src/main/java/com/szwl/model/entity/TCoinOrder.java

@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2023-08-23
+ * @since 2023-08-29
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -62,7 +62,7 @@ public class TCoinOrder implements Serializable {
     private Date payDate;
 
     @ApiModelProperty(value = "支付状态,0:未支付,1:已付款,2:退款中,3:已退款,代替airwallex中的pay_status")
-    private String status;
+    private Integer status;
 
     @ApiModelProperty(value = "商品编号,eg.A06")
     private String productNo;

+ 1 - 1
src/main/java/com/szwl/service/impl/TCoinOrderServiceImpl.java

@@ -23,7 +23,7 @@ import java.util.List;
  * </p>
  *
  * @author wuhs
- * @since 2023-08-23
+ * @since 2023-08-29
  */
 @Service
 public class TCoinOrderServiceImpl extends ServiceImpl<TCoinOrderMapper, TCoinOrder> implements TCoinOrderService {