feat: "线下+海外订单区分设备类型和公司平台"

src/main/java/com/szwl/controller/TCoinOrderController.java

@@ -15,12 +15,15 @@ import com.szwl.model.bean.CoinOrderVO;
 import com.szwl.model.bo.JsonMessage;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TAdmin;
 import com.szwl.model.entity.TCoinOrder;
 import com.szwl.model.entity.TEquipment;
 import com.szwl.model.query.OrderStatisticsDTO;
 import com.szwl.model.query.Pageable;
 import com.szwl.model.utils.JsonUtils;
+import com.szwl.service.TAdminService;
 import com.szwl.service.TCoinOrderService;
+import com.szwl.service.TEquipmentService;
 import com.szwl.service.es.EsTCoinOrderService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
@@ -40,7 +43,7 @@ import java.util.List;
  * </p>
  *
  * @author wuhs
- * @since 2023-08-10
+ * @since 2023-08-23
  */
 @RestController
 @RequestMapping("/tCoinOrder")
@@ -54,6 +57,12 @@ public class TCoinOrderController {
 //    @Resource
 //    EsFeign esFeign;
 
+    @Resource
+    TAdminService adminService;
+
+    @Resource
+    TEquipmentService equipmentService;
+
     @ApiOperation(value = "测试feign")
     @GetMapping("/testFeign")
     public ResponseModel<List> testFeign(String name) {
@@ -86,11 +95,17 @@ public class TCoinOrderController {
         String sn = coinOrderVO.getSn();
         TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(clientId));
 //        System.out.println("设备信息》》》" + equipment);
+        String machineType = equipment.getMachineType(); // 设备类型
+
         Long adminId = equipment.getAdminId();
         if (adminId == null) {
             return JsonMessage.error("找不到设备商家");
         }
 
+        // 根据 adminId 获取admin信息中的公司类型
+        TAdmin byId = adminService.getById(adminId);
+        String companyType = byId.getCompanyType();
+
         TCoinOrder coinOrder = new TCoinOrder();
         coinOrder.setType(null);
         coinOrder.setClientId(clientId);
@@ -102,6 +117,14 @@ public class TCoinOrderController {
         coinOrder.setSn(sn);
         coinOrder.setStatus("1"); // 线下纸币器订单都是已付款
         coinOrder.setIsAir("0"); // 非空中云汇
+        // 设备类型0或null是棉花糖，1是爆米花
+        if ("1".equals(machineType)) {
+            coinOrder.setMachineType("1");
+        }
+        // 如果是七云
+        if ("1".equals(companyType)) {
+            coinOrder.setCompanyType("1");
+        }
         if(coinOrderVO.getProductNumber()==null||coinOrderVO.getProductNumber()==0){
             coinOrderVO.setProductNumber(1);
         }else {

src/main/java/com/szwl/mapper/TCoinOrderMapper.java

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

src/main/java/com/szwl/model/bean/CoinOrderVO.java

@@ -11,6 +11,7 @@ public class CoinOrderVO {
     private String sn;
 
     private String createDate;
+
     /**
      * 订单名字
      */

src/main/java/com/szwl/model/entity/TCoinOrder.java

@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2023-08-10
+ * @since 2023-08-23
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -160,5 +160,8 @@ public class TCoinOrder implements Serializable {
     @ApiModelProperty(value = "airwallex订单金额，币种为美元")
     private BigDecimal amount;
 
+    @ApiModelProperty(value = "设备类型，0：棉花糖，1，爆米花")
+    private String machineType;
+
 
 }

src/main/java/com/szwl/model/query/OrderDaoChuParam.java

@@ -34,4 +34,7 @@ public class OrderDaoChuParam {
     @ApiModelProperty(value = "公司平台，0或空为申泽，1为七云")
     private String companyType;
 
+    @ApiModelProperty(value = "设备类型，0：棉花糖，1，爆米花")
+    private String machineType;
+
 }

src/main/java/com/szwl/service/TCoinOrderService.java

@@ -16,7 +16,7 @@ import java.util.List;
  * </p>
  *
  * @author wuhs
- * @since 2023-08-10
+ * @since 2023-08-23
  */
 public interface TCoinOrderService extends IService<TCoinOrder> {
 

src/main/java/com/szwl/service/impl/TCoinOrderServiceImpl.java

@@ -19,11 +19,11 @@ import java.util.List;
 
 /**
  * <p>
- * 线下支付订单 服务实现类
+ *  服务实现类
  * </p>
  *
  * @author wuhs
- * @since 2023-08-10
+ * @since 2023-08-23
  */
 @Service
 public class TCoinOrderServiceImpl extends ServiceImpl<TCoinOrderMapper, TCoinOrder> implements TCoinOrderService {