认购订单拓管理

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsOrderInfo.java

@@ -32,6 +32,8 @@ public class GoodsOrderInfo {
 
     private String payNo;
 
+    private Integer orderType;
+
     public String getGuid() {
         return guid;
     }
@@ -143,4 +145,12 @@ public class GoodsOrderInfo {
     public void setPayNo(String payNo) {
         this.payNo = payNo==null?null:payNo.trim();
     }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
 }

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/QueryGoodsInfoBO.java

@@ -0,0 +1,16 @@
+package com.hcloud.microserver.system.facade.carbon.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 后台生成订单查询的商品信息
+ * @Author liql
+ * @Date 2020-11-27
+ */
+@Data
+public class QueryGoodsInfoBO {
+    private String goodsId;
+    private String goodsName;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/SubscriptionApply.java

@@ -27,7 +27,7 @@ public class SubscriptionApply extends BaseEntity
     /** 申请客户id */
     @Excel(name = "申请客户id")
     @ApiModelProperty(value = "申请客户id")
-    private Long applyCustomerId;
+    private String applyCustomerId;
 
     /** 申请客户名称 */
     @Excel(name = "申请客户名称")
@@ -69,15 +69,15 @@ public class SubscriptionApply extends BaseEntity
     {
         return guid;
     }
-    public void setApplyCustomerId(Long applyCustomerId)
-    {
-        this.applyCustomerId = applyCustomerId;
-    }
 
-    public Long getApplyCustomerId()
-    {
+    public String getApplyCustomerId() {
         return applyCustomerId;
     }
+
+    public void setApplyCustomerId(String applyCustomerId) {
+        this.applyCustomerId = applyCustomerId;
+    }
+
     public void setApplyCustomName(String applyCustomName)
     {
         this.applyCustomName = applyCustomName;

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/OfflineOrderCondidtionForm.java

@@ -0,0 +1,29 @@
+package com.hcloud.microserver.system.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 线下订单查询搜索条件
+ * @author liql
+ * @Date 2020-11-29
+ */
+@Data
+@ApiModel(value = "线下订单查询搜索条件")
+public class OfflineOrderCondidtionForm extends BaseForm {
+    @ApiModelProperty("订单号")
+    private String orderNo;
+    @ApiModelProperty("企业名称")
+    private String customerName;
+    @ApiModelProperty("订单状态")
+    private Integer orderStatus;
+    @ApiModelProperty("企业账号")
+    private String account;
+
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/CarbonSystemApplication.java

@@ -29,5 +29,6 @@ public class CarbonSystemApplication
     public static void main(String[] args)
     {
         SpringApplication.run(CarbonSystemApplication.class, args);
+        System.out.println("CarbonSystemApplication 启动完成！");
     }
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/bo/CreateOrderBO.java

@@ -2,9 +2,17 @@ package com.hcloud.microserver.system.bank.bo;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
+/**
+ * @Author liql
+ * @Date 2020-11-29
+ */
 @Data
 public class CreateOrderBO {
-    private Long applyCostomerId;
+    private BigDecimal orderCarbonAmount;
+    private Integer orderType;
+    private String applyCostomerId;
     private String productTypeGuid;
     private String provinceId;
     private String cityId;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/bo/OfflineOrderBO.java

@@ -0,0 +1,83 @@
+package com.hcloud.microserver.system.bank.bo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author liql
+ * @Date 2020-11-29
+ */
+@Data
+@ApiModel("订单列表实体")
+public class OfflineOrderBO {
+
+    /**
+     * 订单数据唯一主键
+     */
+    @ApiModelProperty("订单数据唯一主键")
+    private String guid;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+    /**
+     * 客户账号
+     */
+    @ApiModelProperty("客户账号")
+    private String account;
+    /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    /**
+     * 支付金额
+     */
+    @ApiModelProperty("支付金额")
+    private BigDecimal payAmount;
+    /**
+     * 购买碳汇量
+     */
+    @ApiModelProperty("购买碳汇量")
+    private BigDecimal orderCarbonAmount;
+    /**
+     * 订单状态
+     */
+    @ApiModelProperty("订单状态")
+    private String orderStatus;
+    /**
+     * 购买时间
+     */
+    @ApiModelProperty("购买时间")
+    private Date createTime;
+    /**
+     * 证书编号
+     */
+    @ApiModelProperty("证书编号")
+    private String credentialNo;
+    /**
+     * 支付流水号
+     */
+    @ApiModelProperty("支付流水号")
+    private String payNo;
+
+    /**
+     * 订单金额
+     */
+    @ApiModelProperty("订单金额")
+    private BigDecimal orderAmount;
+
+    /**
+     * 订单类型
+     */
+    @ApiModelProperty("订单类型")
+    private String orderType;
+
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/bo/OfflineOrderDetailBO.java

@@ -0,0 +1,52 @@
+package com.hcloud.microserver.system.bank.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author liql
+ * @Date 2020-11-29
+ */
+@Data
+@ApiModel("线下订单详情实体")
+public class OfflineOrderDetailBO {
+    @ApiModelProperty("订单数据唯一主键")
+    private String guid;
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+    @ApiModelProperty("客户账号")
+    private String account;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("支付金额")
+    private BigDecimal payAmount;
+    @ApiModelProperty("购买碳汇量")
+    private BigDecimal orderCarbonAmount;
+    @ApiModelProperty("订单状态")
+    private String orderStatus;
+    @ApiModelProperty("购买时间")
+    private Date createTime;
+    @ApiModelProperty("证书编号")
+    private String credentialNo;
+    @ApiModelProperty("支付流水号")
+    private String payNo;
+    @ApiModelProperty("订单金额")
+    private BigDecimal orderAmount;
+    @ApiModelProperty("订单类型")
+    private String orderType;
+    @ApiModelProperty("支付方式")
+    private String payChannel;
+    @ApiModelProperty("联系电话")
+    private String phone;
+    @ApiModelProperty("客户类型")
+    private String customerTypeName;
+    @ApiModelProperty("订单项列表")
+    List<OfflineOrderItemBO> items;
+
+
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/bo/OfflineOrderItemBO.java

@@ -0,0 +1,30 @@
+package com.hcloud.microserver.system.bank.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author liql
+ * @Date 2020-11-29
+ */
+@Data
+@ApiModel("线下订单项实体")
+public class OfflineOrderItemBO {
+    @ApiModelProperty("商品编码")
+    private String goodsCode;
+    @ApiModelProperty("商品类型")
+    private String goodsType;
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+    @ApiModelProperty("单价")
+    private String goodsPrice;
+    @ApiModelProperty("碳汇量")
+    private BigDecimal saleNum;
+    @ApiModelProperty("金额")
+    private BigDecimal amount;
+
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/controller/OrderInfoController.java

@@ -1,18 +1,21 @@
 package com.hcloud.microserver.system.bank.controller;
 
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microserver.system.bank.bo.CreateOrderBO;
+import com.hcloud.microserver.system.bank.bo.OfflineOrderDetailBO;
 import com.hcloud.microserver.system.bank.bo.OrderInfoBO;
 import com.hcloud.microserver.system.bank.service.OrderInfoService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.system.facade.carbon.forms.GoodsInfoForm;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsOrderInfoForm;
+import com.hcloud.microserver.system.facade.carbon.forms.OfflineOrderCondidtionForm;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/web/order")
@@ -35,8 +38,17 @@ public class OrderInfoController extends BaseController {
      *  2、查询客户信息
      *  3、生成订单
      *  4、生成订单项：（减碳汇量）
-     *  5、生成证书
+     *
      */
+    @ApiOperation("后台创建订单")
+    @PostMapping("/create-order")
+    public ResponseBase create(@RequestBody CreateOrderBO createOrderBO) {
+        int success = this.orderInfoService.createOrder(createOrderBO);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
 
     /**
      * 订单列表：
@@ -46,15 +58,35 @@ public class OrderInfoController extends BaseController {
      *      4、订单号
      */
 
+    @ApiOperation("查询线下订单列表")
+    @GetMapping("/offline_order_list")
+    public ResponseBase<OrderInfoBO> queryOfflineOrderList(@RequestBody OfflineOrderCondidtionForm condidtionForm) {
+        PageInfo pageInfo = orderInfoService.offlineOrderList(condidtionForm);
+        return responseSuccess(pageInfo);
+    }
+
+
     /**
      * 确认收款：
      *  1、将订单状态改为已收款
+     *  2、生成证书
      */
 
+
+
+
     /**
      * 订单详情：
      *  1、根据订单号查询主订单信息
      *  2、根据订单号查询订单项
      */
 
+    @ApiOperation("查询线下订单详情")
+    @GetMapping("/offline_order_detail")
+    public ResponseBase<OfflineOrderDetailBO> queryOrderDetail(String guid) {
+        OfflineOrderDetailBO order = orderInfoService.queryOfflineOrderDetial(guid);
+        ResultVO result =new ResultVO(ResultEnum.SUCCESS,order);
+        return responseSuccess(result);
+    }
+
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/dao/GoodsInfoMapper.java

@@ -4,11 +4,14 @@ import com.github.pagehelper.Page;
 import com.hcloud.microserver.system.bank.bo.GoodsInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.commoncore.base.PageBean;
+import com.hcloud.microserver.system.bank.bo.OfflineOrderDetailBO;
 import com.hcloud.microserver.system.facade.carbon.entity.GoodsInfo;
+import com.hcloud.microserver.system.facade.carbon.entity.QueryGoodsInfoBO;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsInfoForm;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author xiezt
@@ -57,4 +60,12 @@ public interface GoodsInfoMapper extends BaseMapper<GoodsInfo,String> {
      * @return
      */
     List<GoodsInfo> selectGoodsInfoByProductGuid(@Param("productGuid") String productGuid);
+
+    /**
+     * 一次性查出商品信息 根据产品类型（productTypeId）和区域(村子)villageId
+     * @param queryParam
+     * @return
+     */
+    List<QueryGoodsInfoBO> queryGoodsInfoByProductTypeAndArea(Map queryParam);
+
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/dao/GoodsOrderDetailMapper.java

@@ -1,5 +1,6 @@
 package com.hcloud.microserver.system.bank.dao;
 
+import com.hcloud.microserver.system.bank.bo.OfflineOrderItemBO;
 import com.hcloud.microserver.system.bank.bo.OrderDetailInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail;
@@ -26,4 +27,11 @@ public interface GoodsOrderDetailMapper extends BaseMapper<GoodsOrderDetail,Stri
     int batchSaveOrderDetailList(List<GoodsOrderDetail> list);
 
     List<GoodsOrderDetail> selectByGoodsOrderInfoGuid(@Param("goodsOrderInfoGuid") String goodsOrderInfoGuid);
+
+    /**
+     * 根据订单guid查询订单项
+     * @param orderGuid
+     * @return
+     */
+    List<OfflineOrderItemBO> queryOrderDetail(@Param("orderGuid") String orderGuid);
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/dao/GoodsOrderInfoMapper.java

@@ -1,13 +1,17 @@
 package com.hcloud.microserver.system.bank.dao;
 
+import com.hcloud.microserver.system.bank.bo.OfflineOrderBO;
+import com.hcloud.microserver.system.bank.bo.OfflineOrderDetailBO;
 import com.hcloud.microserver.system.bank.bo.OrderInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.commoncore.base.PageBean;
 import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsOrderInfoForm;
+import com.hcloud.microserver.system.facade.carbon.forms.OfflineOrderCondidtionForm;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author xiezt
@@ -42,4 +46,17 @@ public interface GoodsOrderInfoMapper extends BaseMapper<GoodsOrderInfo,String>
      * @return
      */
     int updateOrderBelongInfo(@Param("oldId") String oldCustomerId, @Param("newId") String newCustomerId);
+
+    /**
+     * 查询线下订单list PageBean<OfflineOrderCondidtionForm> pageBean
+     * @return
+     */
+    List<OfflineOrderBO> offlineOrderList(PageBean<OfflineOrderCondidtionForm> pageBean);
+
+    /**
+     * 根据订单guid查询订单详情
+     * @param guid
+     * @return
+     */
+    OfflineOrderDetailBO queryOfflineOrderDetial(@Param("guid") String guid);
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/GoodsInfoService.java

@@ -6,10 +6,12 @@ import com.hcloud.microserver.commoncore.base.BaseServie;
 import com.hcloud.microserver.system.facade.carbon.entity.GoodsInfo;
 import com.hcloud.microserver.system.facade.carbon.entity.GoodsSaleInfo;
 import com.hcloud.microserver.system.facade.carbon.entity.ProductInfo;
+import com.hcloud.microserver.system.facade.carbon.entity.QueryGoodsInfoBO;
 import com.hcloud.microserver.system.facade.carbon.forms.FarmerInfoForm;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsInfoForm;
 
 import java.util.List;
+import java.util.Map;
 
 public interface GoodsInfoService extends BaseServie<GoodsInfo, String> {
 
@@ -44,6 +46,13 @@ public interface GoodsInfoService extends BaseServie<GoodsInfo, String> {
      */
     PageInfo searchGoodsInfoByFarmerId(FarmerInfoForm farmerInfoForm);
 
+    /**
+     * 一次性查出商品信息 根据产品类型（productTypeId）和区域(村子)villageId
+     * @param queryParam
+     * @return
+     */
+    List<QueryGoodsInfoBO> queryGoodsInfoByProductTypeAndArea(Map queryParam);
+
 
 
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/OrderInfoService.java

@@ -2,7 +2,15 @@ package com.hcloud.microserver.system.bank.service;
 
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.commoncore.base.BaseServie;
+import com.hcloud.microserver.system.bank.bo.CreateOrderBO;
+import com.hcloud.microserver.system.bank.bo.OfflineOrderBO;
+import com.hcloud.microserver.system.bank.bo.OfflineOrderDetailBO;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsOrderInfoForm;
+import com.hcloud.microserver.system.facade.carbon.forms.OfflineOrderCondidtionForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author xiezt
@@ -73,5 +81,25 @@ public interface OrderInfoService extends BaseServie<GoodsOrderInfoForm,String>
      */
     GoodsOrderInfoForm saveOrderInfoForOffline(GoodsOrderInfoForm goodsOrderInfoForm);
 
+    /**
+     * 后台生成订单
+     * @param createOrderBO
+     * @return
+     */
+    int createOrder(CreateOrderBO createOrderBO);
+
+    /**
+     * 查询线下订单
+     * @param condidtionForm
+     * @return
+     */
+    PageInfo offlineOrderList(OfflineOrderCondidtionForm condidtionForm);
+
+    /**
+     * 根据订单guid查询订单详情
+     * @param guid
+     * @return
+     */
+    OfflineOrderDetailBO queryOfflineOrderDetial(@Param("guid") String guid);
 
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/PovertyAreaService.java

@@ -37,6 +37,6 @@ public interface PovertyAreaService {
      * @param povertyArea
      * @return
      */
-    List<PovertyArea> findByFiveIds(PovertyArea povertyArea);
+   // List<PovertyArea> findByFiveIds(PovertyArea povertyArea);
 
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/GoodsInfoServiceImpl.java

@@ -11,10 +11,7 @@ import com.hcloud.microserver.commoncore.base.PageBean;
 import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
 import com.hcloud.microserver.commoncore.util.BusinessCodeRule;
 import com.hcloud.microserver.commoncore.util.UUIDUtils;
-import com.hcloud.microserver.system.facade.carbon.entity.GoodsDetail;
-import com.hcloud.microserver.system.facade.carbon.entity.GoodsInfo;
-import com.hcloud.microserver.system.facade.carbon.entity.GoodsSaleInfo;
-import com.hcloud.microserver.system.facade.carbon.entity.ProductInfo;
+import com.hcloud.microserver.system.facade.carbon.entity.*;
 import com.hcloud.microserver.system.facade.carbon.forms.FarmerInfoForm;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsDetailForm;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsInfoForm;
@@ -26,10 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * @author zhuxx
@@ -425,4 +419,15 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
         List<GoodsInfoBO> list = goodsInfoMapper.searchGoodsInfoByFarmerId(farmerInfoForm.getGuid());
         return new PageInfo(list);
     }
+
+    /**
+     * 一次性查出商品信息 根据产品类型（productTypeId）和区域(村子)villageId
+     *
+     * @param queryParam
+     * @return
+     */
+    @Override
+    public List<QueryGoodsInfoBO> queryGoodsInfoByProductTypeAndArea(Map queryParam) {
+        return goodsInfoMapper.queryGoodsInfoByProductTypeAndArea(queryParam);
+    }
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/OrderInfoServiceImpl.java

@@ -2,16 +2,16 @@ package com.hcloud.microserver.system.bank.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.system.bank.bo.OrderInfoBO;
-import com.hcloud.microserver.system.bank.dao.GoodsOrderInfoMapper;
+import com.hcloud.microserver.security.util.SecurityUtils;
+import com.hcloud.microserver.system.bank.bo.*;
+import com.hcloud.microserver.system.bank.dao.*;
 import com.hcloud.microserver.system.bank.events.CredentialInfoEvent;
 import com.hcloud.microserver.commoncore.base.PageBean;
 import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
 import com.hcloud.microserver.commoncore.util.GeneratorIdUtils;
 import com.hcloud.microserver.commoncore.util.GetUUID;
 import com.hcloud.microserver.system.bank.service.*;
-import com.hcloud.microserver.system.facade.carbon.entity.GoodsInfo;
-import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo;
+import com.hcloud.microserver.system.facade.carbon.entity.*;
 import com.hcloud.microserver.system.facade.carbon.forms.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,10 +20,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.security.auth.Subject;
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * @author xiezt
@@ -35,35 +34,27 @@ public class OrderInfoServiceImpl implements OrderInfoService {
 
     @Resource
     private GoodsOrderInfoMapper goodsOrderInfoMapper;
-
     @Autowired
     private OrderDetailInfoService orderDetailInfoService;
-
+    @Resource
+    private GoodsOrderDetailMapper goodsOrderDetailMapper;
+    @Resource
+    private GoodsSaleInfoMapper goodsSaleInfoMapper;
     @Autowired
     private OrderPayApplyService orderPayApplyService;
-
     @Autowired
     private OrderPayService orderPayService;
-
     @Autowired
     private CustomerInfoService customerInfoService;
-
     @Autowired
     private ApplicationContext applicationContext;
-
     @Autowired
     private OrderSaleInfoService orderSaleInfoService;
-
     @Autowired
     private FarmerInfoService farmerInfoService;
-
-    @Autowired
-    private CollectiveFarmerService collectiveFarmerService;
-
     @Autowired
     private GoodsInfoService goodsInfoService;
 
-
     /**
      * 分页查询订单信息
      *
@@ -369,6 +360,141 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         return null;
     }
 
+    /**
+     * 后台生成订单
+     *
+     * @param createOrderBO
+     * @return
+     */
+    @Override
+    @Transactional
+    public int createOrder(CreateOrderBO createOrderBO) {
+        //查询商品信息
+        Map<String,String> queryParam = new HashMap<String,String>();
+        queryParam.put("productTypeId",createOrderBO.getProductTypeGuid());
+        queryParam.put("villageId",createOrderBO.getVillageId());
+        List<QueryGoodsInfoBO> goodsList = goodsInfoService.queryGoodsInfoByProductTypeAndArea(queryParam);
+        if(goodsList.size()==0){
+            throw new RuntimeException("没有满足要求的商品");
+        }
+
+        //查询客户信息
+        CustomerInfoForm customer = customerInfoService.getCustomerInfoById(createOrderBO.getApplyCostomerId());
+        //保存主订单
+        GoodsOrderInfo order = new GoodsOrderInfo();
+        order.setCustomerName(customer.getCustomerName());
+        order.setFkCustomerGuid(customer.getGuid());
+        order.setCustomerType(customer.getCustomerType().toString());
+
+        order.setOrderCarbonAmount(createOrderBO.getOrderCarbonAmount());
+        order.setOrderStatus(1);
+        order.setCreateUser(SecurityUtils.getUserId()==null?"1":SecurityUtils.getUserId().toString());
+        order.setOrderType(createOrderBO.getOrderType());
+
+        GeneratorIdUtils generatorIdUtils = new GeneratorIdUtils();
+        String orderNum = generatorIdUtils.nextId();
+        order.setOrderNo(orderNum);
+
+        order.setGuid(GetUUID.getUUID());
+        order.setState(1);
+        order.setCreateTime(new Date());
+        order.setModifiedTime(new Date());
+
+
+        //保存订单详情
+        BigDecimal difference = createOrderBO.getOrderCarbonAmount();
+        BigDecimal totalAmount = new BigDecimal(0);
+        for (QueryGoodsInfoBO goods:goodsList) {
+            GoodsSaleInfo saleInfo = goodsSaleInfoMapper.getGoodsSaleInfoByGoodsId(goods.getGoodsId());
+            GoodsOrderDetail orderDetail = new GoodsOrderDetail();
+            orderDetail.setGuid(GetUUID.getUUID());
+            orderDetail.setFkOrderGuid(order.getGuid());
+            orderDetail.setFkGoodsGuid(goods.getGoodsId());
+            orderDetail.setGoodsName(goods.getGoodsName());
+            BigDecimal salePrice = saleInfo.getSalePrice();
+            orderDetail.setGoodsPrice(salePrice);
+            orderDetail.setState(1);
+            orderDetail.setCreateUser(SecurityUtils.getUserId()==null?"1":SecurityUtils.getUserId().toString());
+            orderDetail.setCreateTime(new Date());
+
+            BigDecimal carbonVal = saleInfo.getUnsaledCarbonSkin();
+            BigDecimal subtractResult =  difference.subtract(carbonVal);
+            if(subtractResult.doubleValue()>=0){
+                difference = subtractResult;
+                orderDetail.setSaleNum(carbonVal);
+                BigDecimal amount = salePrice.multiply(carbonVal);
+                orderDetail.setAmount(amount);
+                totalAmount.add(amount);
+                goodsOrderDetailMapper.insertSelective(orderDetail);
+                //更新销售表
+                saleInfo.setUnsaledCarbonSkin(new BigDecimal(0));
+                BigDecimal saleCarbonSkin = saleInfo.getSaledCarbonSkin();
+                BigDecimal newSaleCarbonSkin =  saleCarbonSkin.add(carbonVal);
+                saleInfo.setSaledCarbonSkin(newSaleCarbonSkin);
+                goodsSaleInfoMapper.updateByPrimaryKeySelective(saleInfo);
+
+                continue;
+            }else{
+                orderDetail.setSaleNum(difference);
+                BigDecimal amount = salePrice.multiply(difference);
+                orderDetail.setAmount(amount);
+                totalAmount.add(amount);
+                goodsOrderDetailMapper.insertSelective(orderDetail);
+
+                //更新销售表
+                BigDecimal unsaledCarbonSkin = saleInfo.getUnsaledCarbonSkin();
+                BigDecimal newUnsaledCarbonSkin = unsaledCarbonSkin.subtract(difference);
+                saleInfo.setUnsaledCarbonSkin(newUnsaledCarbonSkin);
+                BigDecimal saleCarbonSkin = saleInfo.getSaledCarbonSkin();
+                BigDecimal newSaleCarbonSkin =  saleCarbonSkin.add(difference);
+                saleInfo.setSaledCarbonSkin(newSaleCarbonSkin);
+
+                goodsSaleInfoMapper.updateByPrimaryKeySelective(saleInfo);
+                difference = new BigDecimal(0);
+                break;
+            }
+        }
+
+        if(difference.intValue()>0){
+            throw new RuntimeException("满足的条件的商品的库存不足");
+        }
+
+        order.setOrderAmount(totalAmount);
+        //保存
+        int saveOrderResult =  goodsOrderInfoMapper.insertSelective(order);
+
+        return saveOrderResult;
+    }
+
+    /**
+     * 查询线下订单
+     *
+     * @param condidtionForm
+     * @return
+     */
+    @Override
+    public PageInfo offlineOrderList(OfflineOrderCondidtionForm condidtionForm) {
+        PageBean pageBean = new PageBean(condidtionForm);
+        PageHelper.startPage(condidtionForm.getPageNo(),condidtionForm.getPageSize());
+        List<OfflineOrderBO> list =goodsOrderInfoMapper.offlineOrderList(pageBean);
+        return new PageInfo(list);
+    }
+
+    /**
+     * 根据订单guid查询订单详情
+     *
+     * @param guid
+     * @return
+     */
+    @Override
+    public OfflineOrderDetailBO queryOfflineOrderDetial(String guid) {
+        //获取主订单信息
+        OfflineOrderDetailBO order = goodsOrderInfoMapper.queryOfflineOrderDetial(guid);
+        //获取订单项
+        List<OfflineOrderItemBO> items = goodsOrderDetailMapper.queryOrderDetail(guid);
+        order.setItems(items);
+        return order;
+    }
 
     @Override
     public int delByPrimaryKey(String guid) {

carbon-back/carbon-back-service/src/main/resources/carbon/CustomerInfoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="CustomerInfoMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.CustomerInfoMapper">
   <resultMap id="BaseResultMap" type="CustomerInfo">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="account" jdbcType="VARCHAR" property="account" />

carbon-back/carbon-back-service/src/main/resources/carbon/GoodsInfoMapper.xml

@@ -471,4 +471,13 @@
             product.state = 1 and detail.state = 1 and goods.state = 1 and product.guid = #{productGuid,jdbcType=VARCHAR}
         </where>
     </select>
+
+    <!-- 一次性查出商品信息 根据产品类型和区域(村子)id -->
+    <select id="queryGoodsInfoByProductTypeAndArea" parameterType="Map" resultType="QueryGoodsInfoBO">
+            SELECT g.guid AS goodsId,g.goods_name AS goodsName
+                FROM t_goods_detail d JOIN t_goods_info g ON d.fk_goods_guid=g.guid
+                                                            JOIN t_product_info p ON p.guid=d.fk_product_guid
+                                                            JOIN t_poverty_area a ON a.guid=p.fk_poverty_area
+                WHERE p.fk_product_type=#{productTypeId} and a.village_id=#{villageId}
+    </select>
 </mapper>

carbon-back/carbon-back-service/src/main/resources/carbon/GoodsOrderDetailMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="GoodsOrderDetailMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsOrderDetailMapper">
   <resultMap id="BaseResultMap" type="GoodsOrderDetail">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="fk_order_guid" jdbcType="CHAR" property="fkOrderGuid" />
@@ -194,4 +194,15 @@
     where state = 1
     and fk_order_guid = #{goodsOrderInfoGuid,jdbcType=VARCHAR}
   </select>
+  <!-- 根据订单guid查询订单项 -->
+  <select id="queryOrderDetail" parameterType="String" resultType="OfflineOrderItemBO">
+    SELECT g.goods_code AS goodsCode,
+			 g.goods_type AS goodsType,
+			 d.goods_name AS goodsName,
+			 d.goods_price AS goodsPrice,
+			 d.sale_num AS saleNum,
+			 d.amount
+    FROM t_goods_order_detail d LEFT JOIN t_goods_info g ON d.fk_goods_guid=g.guid
+    WHERE d.fk_order_guid=#{orderGuid}
+  </select>
 </mapper>

carbon-back/carbon-back-service/src/main/resources/carbon/GoodsOrderInfoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="GoodsOrderInfoMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsOrderInfoMapper">
   <resultMap id="BaseResultMap" type="GoodsOrderInfo">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="fk_customer_guid" jdbcType="CHAR" property="fkCustomerGuid" />
@@ -16,11 +16,12 @@
     <result column="modified_user" jdbcType="CHAR" property="modifiedUser" />
     <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
     <result column="pay_no" jdbcType="VARCHAR" property="payNo" />
+    <result column="order_type" jdbcType="INTEGER" property="orderType" />
   </resultMap>
   <sql id="Base_Column_List">
     guid, fk_customer_guid, order_no,customer_name,customer_type, order_amount,
     order_carbon_amount, order_status,state, create_user, create_time, modified_user,
-     modified_time,pay_no
+     modified_time,pay_no,order_type
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
@@ -132,12 +133,12 @@
     insert into t_goods_order_info (guid, fk_customer_guid, order_no, 
       customer_name,customer_type,order_amount, order_carbon_amount, order_status,
       state, create_user, create_time, 
-      modified_user, modified_time,pay_no)
+      modified_user, modified_time,pay_no,order_type)
     values (#{guid,jdbcType=CHAR}, #{fkCustomerGuid,jdbcType=CHAR}, #{orderNo,jdbcType=CHAR}, 
       #{customerName,jdbcType=VARCHAR},#{customerType,jdbcType=VARCHAR},#{orderAmount,jdbcType=DECIMAL},
       #{orderCarbonAmount,jdbcType=DECIMAL}, #{orderStatus,jdbcType=INTEGER},
       #{state,jdbcType=INTEGER}, #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{modifiedUser,jdbcType=CHAR}, #{modifiedTime,jdbcType=TIMESTAMP},#{payNo,jdbcType=VARCHAR})
+      #{modifiedUser,jdbcType=CHAR}, #{modifiedTime,jdbcType=TIMESTAMP},#{payNo,jdbcType=VARCHAR},#{orderType,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="GoodsOrderInfo">
     insert into t_goods_order_info
@@ -184,6 +185,9 @@
       <if test="payNo != null">
         pay_no,
       </if>
+      <if test="orderType != null">
+        order_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="guid != null">
@@ -228,6 +232,9 @@
       <if test="payNo != null">
         #{payNo,jdbcType=VARCHAR},
       </if>
+      <if test="orderType != null">
+        #{orderType,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="GoodsOrderInfo">
@@ -272,6 +279,9 @@
       <if test="payNo != null">
         pay_no = #{payNo,jdbcType=VARCHAR},
       </if>
+      <if test="orderType != null">
+        order_type = #{orderType,jdbcType=INTEGER},
+      </if>
     </set>
     where guid = #{guid,jdbcType=CHAR}
   </update>
@@ -290,6 +300,7 @@
       modified_user = #{modifiedUser,jdbcType=CHAR},
       modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
       pay_no = #{payNo,jdbcType=VARCHAR}
+      order_type = #{orderType,jdbcType=INTEGER}
     where guid = #{guid,jdbcType=CHAR}
   </update>
     <update id="updateOrderBelongInfo">
@@ -297,4 +308,104 @@
           set fk_customer_guid = #{newId}
      where fk_customer_guid = #{oldId}
     </update>
+    <!-- 线下认购订单列表 -->
+    <select id="offlineOrderList" parameterType="com.hcloud.microserver.commoncore.base.PageBean" resultType="OfflineOrderBO">
+        SELECT 	o.guid,
+        o.order_no AS orderNo,
+        o.order_amount AS orderAmount,
+        o.order_carbon_amount AS orderCarbonAmount,
+        o.create_time AS createTime,
+        CASE o.order_type
+        WHEN 1 THEN
+        '线上订单'
+        WHEN 1 THEN
+        '认购订单'
+        ELSE
+        '后台订单'
+        END AS orderType,
+        CASE o.order_status
+        WHEN 1 THEN
+        '未付款'
+        WHEN 2 THEN
+        '已完成'
+        WHEN 3 THEN
+        '未审核'
+        WHEN 4 THEN
+        '等待打款'
+        ELSE
+        '等待再审核'
+        END AS orderStatus,
+        c.account,
+        c.customer_name AS customerName,
+        gc.guid AS credentialNo
+        FROM t_goods_order_info o LEFT JOIN t_customer_info c ON o.fk_customer_guid = c.guid
+        LEFT JOIN t_goods_credential_info gc ON gc.fk_order_id = o.guid
+        WHERE o.state=1 AND order_type!=0
+        <if test="data.customerName!=null and data.customerName!=''">
+            AND c.customer_name LIKE concat('%', #{data.customerName}, '%')
+        </if>
+        <if test="data.account!=null and data.account!=''">
+            AND c.account=#{data.account}
+        </if>
+        <if test="data.orderNo!=null and data.orderNo != ''">
+            AND o.order_no=#{data.orderNo}
+        </if>
+        <if test="data.orderStatus !=null and data.orderStatus != ''">
+            AND o.order_status=#{data.orderStatus};
+        </if>
+        ORDER BY o.create_time DESC
+    </select>
+    <!-- 查询线下认购订单详情-->
+    <select id="queryOfflineOrderDetial" parameterType="String" resultType="OfflineOrderDetailBO">
+        SELECT 	o.guid,
+				o.order_no AS orderNo,
+				o.order_amount AS orderAmount,
+				o.order_carbon_amount AS orderCarbonAmount,
+				o.create_time AS createTime,
+				CASE o.order_type
+				WHEN 1 THEN
+						'线上订单'
+				WHEN 1 THEN
+						'认购订单'
+				ELSE
+						'后台订单'
+				END AS orderType,
+				CASE o.order_status
+				WHEN 1 THEN
+						'未付款'
+				WHEN 2 THEN
+						'已完成'
+				WHEN 3 THEN
+						'未审核'
+				WHEN 4 THEN
+						'等待打款'
+				ELSE
+						'等待再审核'
+				END AS orderStatus,
+			  CASE p.pay_channel
+				WHEN 1 THEN
+						'微信支付'
+				WHEN 2 THEN
+						'支付宝'
+				WHEN 3 THEN
+						'银联支付'
+				ELSE
+						'线下支付'
+				END AS payChannel,
+				c.account,
+				c.customer_name AS customerName,
+				c.phone,
+				CASE c.customer_type
+				WHEN 1 THEN
+					'自然人'
+				WHEN 2 THEN
+					'履约企业'
+				ELSE
+					'非履约企业'
+				END AS customerTypeName,
+				o.pay_no AS payNo
+			FROM t_goods_order_info o LEFT JOIN t_customer_info c ON o.fk_customer_guid = c.guid
+									  LEFT JOIN t_goods_pay_order p ON p.fk_order_id = o.guid
+					WHERE o.guid= #{guid}
+    </select>
 </mapper>

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/entity/SubscriptionApply.java

@@ -26,7 +26,7 @@ public class SubscriptionApply extends BaseEntity
     /** 申请客户id */
     @Excel(name = "申请客户id")
     @ApiModelProperty(value = "申请客户id")
-    private Long applyCustomerId;
+    private String applyCustomerId;
 
     /** 申请客户名称 */
     @Excel(name = "申请客户名称")
@@ -68,15 +68,15 @@ public class SubscriptionApply extends BaseEntity
     {
         return guid;
     }
-    public void setApplyCustomerId(Long applyCustomerId)
-    {
-        this.applyCustomerId = applyCustomerId;
-    }
 
-    public Long getApplyCustomerId()
-    {
+    public String getApplyCustomerId() {
         return applyCustomerId;
     }
+
+    public void setApplyCustomerId(String applyCustomerId) {
+        this.applyCustomerId = applyCustomerId;
+    }
+
     public void setApplyCustomName(String applyCustomName)
     {
         this.applyCustomName = applyCustomName;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/service/impl/SubscriptionApplyServiceImpl.java

@@ -4,7 +4,9 @@ import com.hcloud.microserver.commoncore.util.UUIDUtils;
 import com.hcloud.microserver.commoncore.util.reflect.DateUtils;
 import com.hcloud.microserver.h5.dao.SubscriptionApplyMapper;
 import com.hcloud.microserver.h5.entity.SubscriptionApply;
+import com.hcloud.microserver.h5.facade.carbon.forms.CustomerInfoForm;
 import com.hcloud.microserver.h5.forms.SubscriptionApplyForm;
+import com.hcloud.microserver.h5.service.CustomerService;
 import com.hcloud.microserver.h5.service.ISubscriptionApplyService;
 import com.hcloud.microserver.security.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +25,8 @@ public class SubscriptionApplyServiceImpl implements ISubscriptionApplyService
 {
     @Autowired
     private SubscriptionApplyMapper subscriptionApplyMapper;
+    @Autowired
+    private CustomerService customerService;
 
     /**
      * 查询碳汇认购申请
@@ -62,10 +66,13 @@ public class SubscriptionApplyServiceImpl implements ISubscriptionApplyService
 
         apply.setAmount(applyForm.getAmount());
         apply.setRemark(applyForm.getRemark());
-        Long applyCustomerId = SecurityUtils.getUserId()==null?1:SecurityUtils.getUserId();
+
+        CustomerInfoForm customerInfo = customerService.getCurrentMember();
+        String applyCustomerId = customerInfo.getGuid();
+        String applyCustomName = customerInfo.getCustomerName();
         apply.setApplyCustomerId(applyCustomerId);
-        String applyCustomName = SecurityUtils.getUsername()==null?"测试认购企业":SecurityUtils.getUsername();
         apply.setApplyCustomName(applyCustomName);
+
         apply.setRecordStatus(1);
         apply.setApplyStatus(0);
         apply.setApplyDate(DateUtils.getDate());