修改提交

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/PriceItem.java

@@ -192,5 +192,8 @@ public class PriceItem implements Serializable {
 		@ApiModelProperty(value = "产地")
 		private String placeProduction;
 
+		private BigDecimal freightFees;
+
+		private BigDecimal labelFees;
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -718,4 +718,9 @@ public class Order implements Serializable {
 	private String pageStatus;
 	@TableField(exist = false)
 	private String pageLabel;
+
+	//是否包含运费
+	private Integer isFreight;
+	//是否包含标签
+	private Integer isLabel;
 }

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceItemController.java

@@ -22,6 +22,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 
 import javax.servlet.http.HttpServletResponse;
@@ -164,5 +165,18 @@ public class PriceItemController extends BladeController {
 		return R.success("操作成功");
 	}
 
+	/**
+	 * 获取销售价格
+	 * */
+	@GetMapping("getSalePrice")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "获取销售价格", notes = "传入excel")
+	public R getSalePrice(@ApiParam(value = "大字", required = true) @RequestParam String code,
+						  @ApiParam(value = "是否运费", required = true) @RequestParam Integer ids,
+						  @ApiParam(value = "是否标签", required = true) @RequestParam Integer ids)
+	{
+
+	}
+
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -417,6 +417,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				selectById.setCorpId(item.getCorpId());
 				selectById.setSrcOrderNo(selectById.getSysNo());
 				selectById.setId(null);
+				selectById.setStatus(0);
 				selectById.setSysNo((String) billNo.getData());
 				selectById.setTenantId(SecureUtil.getTenantId());
 				selectById.setCreateTime(new Date());

blade-service/trade-finance/src/main/java/org/springblade/finance/tool/JdyTool.java

@@ -9,6 +9,7 @@ import com.jdy.v7sdk.business.models.errorInfo;
 import com.jdy.v7sdk.models.AccountGroupRequest;
 import com.github.kevinsawicki.http.HttpRequest;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.formula.functions.T;
 import org.springblade.finance.TokenRequestQuery;
 import org.springblade.finance.vojo.JDYitems;
@@ -19,6 +20,7 @@ import java.util.List;
 /**
  * 金蝶测试demo, 如果需要正式的,则需要替换
  * */
+@Slf4j
 public class JdyTool
 {
 
@@ -93,8 +95,12 @@ public class JdyTool
 
 
 		String body = httpRequest.body().toString();
+		log.info("请求结果:"+body);
 		//获取返回对象
 		JDYSaveResponse  saveResponse = JSONObject.parseObject(body, JDYSaveResponse.class);
+		log.info("请求结果结果:"+saveResponse.getSuccess());
+		log.info("请求结果状态码:"+saveResponse.getErrorCode());
+		/*log.info("请求返回体:"+saveResponse.toString());*/
 		//获取主表id
 		List<String> successPkIds = saveResponse.getData().get(0).getSuccessPkIds();
 		/*System.out.println("请求body===="+httpRequest.body().toString());